- tbb-commits - lists.torproject.org

[tor-browser-build/maint-10.0-android] Bug 40156: Update GeckoView to 84.0b1
by sysrqb＠torproject.org 12 Dec '20

12 Dec '20

commit e6e880e6f3947ad0916768a0fecad2d2467efad0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 18 09:20:44 2020 +0000 Bug 40156: Update GeckoView to 84.0b1 We need to make sure that we are actually using Java 1.8, otherwise the build breaks. The jaxb-parent-2.2.11.pom update is needed as it seems someone fixed the line endings of that .pom file and replaced the one we had used in previous dependency lists. --- projects/geckoview/config | 5 +++-- projects/geckoview/gradle-dependencies-list.txt | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/projects/geckoview/config b/projects/geckoview/config index 35d19d4..5ac9141 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - geckoview_version: 83.0 + geckoview_version: 84.0b1 torbrowser_branch: 10.0 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: @@ -25,7 +25,7 @@ var: container: use_container: 1 # this should be updated when the list of gradle dependencies is changed - gradle_dependencies_version: 4 + gradle_dependencies_version: 5 steps: merge_aars: @@ -72,6 +72,7 @@ steps: exit 1 fi + export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64 gradle_repo=/var/tmp/dist/gradle-dependencies export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo" export GRADLE_FLAGS="--no-daemon --offline" diff --git a/projects/geckoview/gradle-dependencies-list.txt b/projects/geckoview/gradle-dependencies-list.txt index 805b1aa..f60620b 100644 --- a/projects/geckoview/gradle-dependencies-list.txt +++ b/projects/geckoview/gradle-dependencies-list.txt @@ -65,7 +65,7 @@ c33e67a0807095f02a0e2da139412dd7c4f9cc1a4c054b3e434f96831ba950f4 | https://jcent ebe7137b5fbfd050545f9a7f3f339ae55beb0b53755071b4fd62aa024c626d1c | https://jcenter.bintray.com/com/sun/istack/istack-commons-runtime/2.21/ista… c3071277f89b162982606b4e65c92077212efb6cbf1bdc365c51bd0b57ac818c | https://jcenter.bintray.com/com/sun/istack/istack-commons/2.21/istack-commo… b25e0693de21cb92b039a2e4608f396590fb8773108f10d6dc9f1465f03b5be9 | https://jcenter.bintray.com/com/sun/xml/bind/jaxb-bom-ext/2.2.11/jaxb-bom-e… -b5301b711c01547e571b615f9a0832ee525d34a4ce3372f53907a87cf20b0480 | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-parent/2.2.11/jaxb-pa… +010b745ee463eb822ceca023089d00708f021811eb3c285fbba72a3b564a0774 | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-parent/2.2.11/jaxb-pa… 21918cb8e4eda67f24251e909a5d81672201d93604c4ffbf33522ad836a58e90 | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.2.11… 9a398c699a5d3f3b56f1056c68890ede25d94a12d98eabc2a473733e6ab2362c | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-txw-parent/2.2.11/jax… 27a77db909f3c2833c0b1a37c55af1db06045118ad2eed96ce567b6632bce038 | https://jcenter.bintray.com/com/sun/xml/fastinfoset/FastInfoset/1.2.13/Fast… @@ -493,5 +493,5 @@ feb4ebb1ddb76dc18ee9e6028205ac226a70d40247fcccaca092303c68f8b59d | https://maven fdd93302c2eb94bbe6007caa28d072246d2875cda5cb774bb6299416b94d74a6 | https://maven.google.com/com/google/android/gms/play-services-tasks/17.0.0/… 7680e381a3c03798d999b2e441caadd8a56a0a808e108024a67af9fe26c11adc | https://maven.google.com/com/google/android/material/material/1.0.0/materia… c9fff541d51c11195de305c50bbfe4d1dfc97841983d95f6d7101112603515ab | https://maven.google.com/com/google/android/material/material/1.0.0/materia… -ece749bdea04522b04a7b0cfd391026f88808c4d0103b3bede8b42baf0b7d677 | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.3.1/apilint-0.3… -efd7067a5c6ed990ea698d42b56fb324062a2cb9556aff5d656b7c739d2134ba | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.3.1/apilint-0.3… +33850fe43f064f95068ca0d81cb99fdb6d67af5e07f0626e433b51b9c2683aee | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.4.0/apilint-0.4… +cf8acbecac4506eff7c2aead2f5f7c4aeb3120a57d6236f55e0e2f750fab1b55 | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.4.0/apilint-0.4…

1 0

[tor-browser-build/maint-10.0-android] Bug 40156: Add uniffi-rs for application-services
by sysrqb＠torproject.org 12 Dec '20

12 Dec '20

commit a5471ba2918837e028b3a503260f4bbb58e41f3c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 27 12:25:02 2020 +0000 Bug 40156: Add uniffi-rs for application-services --- projects/uniffi-rs/build | 34 ++++++++++++++++++++++++++++++++++ projects/uniffi-rs/config | 17 +++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/projects/uniffi-rs/build b/projects/uniffi-rs/build new file mode 100644 index 0000000..60ba1b1 --- /dev/null +++ b/projects/uniffi-rs/build @@ -0,0 +1,34 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist +builddir=/var/tmp/build/[% project %] +mkdir -p $distdir/[% project %] +tar -C $distdir -xf $rootdir/[% c('input_files_by_name/rust') %] +export PATH="/var/tmp/dist/rust/bin:$PATH" +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz + +# Now prepare the offline build +# Move the directory for hardcoding the path in .cargo/config +mv /var/tmp/build/[% project %]-[% c('version') %] $builddir +tar -C $builddir -xjf uniffi-rs-vendor-[% c('version') %].tar.bz2 +cd $builddir +mkdir .cargo +cat > .cargo/config << 'EOF' +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "/var/tmp/build/uniffi-rs/vendor" +EOF + +# We usually use --frozen but there is no Cargo.lock file available. Thus resort +# to --offline. +cargo build --release --offline --target x86_64-unknown-linux-gnu +mv target/x86_64-unknown-linux-gnu/release/uniffi-bindgen $distdir/[% project %] + +cd $distdir +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/uniffi-rs/config b/projects/uniffi-rs/config new file mode 100644 index 0000000..5dda990 --- /dev/null +++ b/projects/uniffi-rs/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: 0.5.0 +git_url: https://github.com/mozilla/uniffi-rs +git_hash: bc4a8570ab8430a4f80c3722ef79ff9a4819969e +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +input_files: + - project: container-image + - name: rust + project: rust + # `cargo vendor vendor` in the `uniffi-rs` directory has vendored the sources. + - URL: https://people.torproject.org/~gk/mirrors/sources/uniffi-rs-vendor-[% c('version') %].tar.bz2 + sha256sum: 71d912237208c35a762b3c812afe0a758823792dd745c1253314bcccc1694b7f

1 0

[tor-browser-build/maint-10.0-android] Bug 40156: Move android-components Gradle to Gradle project
by sysrqb＠torproject.org 12 Dec '20

12 Dec '20

commit 738356bb01e7c5a2989e652401d8163771d7a211 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 27 20:27:19 2020 +0000 Bug 40156: Move android-components Gradle to Gradle project --- projects/android-components/build | 13 ++++++++----- projects/android-components/config | 6 ++---- projects/gradle/config | 7 +++++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/projects/android-components/build b/projects/android-components/build index bbd7c00..187750f 100644 --- a/projects/android-components/build +++ b/projects/android-components/build @@ -3,10 +3,14 @@ [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist builddir=/var/tmp/build/[% project %] -gradle_path=$GRADLE_HOME/gradle-[% c("var/gradle_version") %]/bin mkdir $distdir/[% project %] mkdir /var/tmp/build +tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] +# XXX: Not needed once we are done with moving Gradle out of our toolchain +# project. +export PATH=$GRADLE_HOME/gradle/bin:$PATH + cat > get-moz-build-date << "EOF" [% INCLUDE "get-moz-build-date" %] EOF @@ -27,7 +31,6 @@ EOF # according to the Gradle dependencies list. cp -rf $distdir/application-services/maven/org $gradle_repo [% END %] -unzip -d $GRADLE_HOME [% c('input_files_by_name/gradle') %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd $builddir-[% c('version') %] @@ -36,7 +39,7 @@ patch -p1 < $rootdir/git.patch # XXX: fetching deps for `assembleGeckoBeta -x lint` by using that same target # results in some missing dependencies for yet unknown reasons. Thus, we use # `assemble` instead for now. - $gradle_path/gradle --debug --no-daemon assemble + gradle --debug --no-daemon assemble [% ELSE %] # Prepare Glean dependencies for offline build tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2 @@ -70,8 +73,8 @@ patch -p1 < $rootdir/git.patch cd ../../ gradle_args="--offline --no-daemon -Dmaven.repo.local=$gradle_repo" - $gradle_path/gradle $gradle_args assembleGecko[% c('variant') %] -x lint - $gradle_path/gradle $gradle_args publish + gradle $gradle_args assembleGecko[% c('variant') %] -x lint + gradle $gradle_args publish # We only need the archives and .pom files for now. find components -regex '.*[% c('var/android_components_version') %].$aar\|jar\|pom$' -exec cp --parents {} $distdir \; diff --git a/projects/android-components/config b/projects/android-components/config index 09fb0f3..81d99cd 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -16,7 +16,6 @@ var: gradle_dependencies_version: 10 # Switch to make it easier to grab all dependencies during a dry-run. fetch_gradle_dependencies: 0 - gradle_version: 6.6.1 targets: nightly: @@ -27,6 +26,8 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' + - project: gradle + name: gradle - name: geckoview project: geckoview pkg_type: merge_aars @@ -47,6 +48,3 @@ input_files: - URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-[% c('var/glean_parser') %].tar.bz2 sha256sum: bdbb421fdcc9b66aebe8f41b33e254cab722355c59c0f43f10a8322d7d6da6a4 enable: '[% !c("var/fetch_gradle_dependencies") %]' - - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version") %]-bin.zip - name: gradle - sha256sum: 7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac diff --git a/projects/gradle/config b/projects/gradle/config index fe995fb..4414436 100644 --- a/projects/gradle/config +++ b/projects/gradle/config @@ -6,10 +6,13 @@ var: use_container: 1 deps: - unzip - gradle_version: 6.5 + # XXX: Think about ways to make this more legible, in particular once more + # Gradle versions get added. + gradle_version: '[% IF pc(c("origin_project"), "var/application_services") %]6.5[% ELSE %]6.6.1[% END %]' + gradle_sha256sum: '[% IF pc(c("origin_project"), "var/application_services") %]23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f[% ELSE %]7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac[% END %]' input_files: - project: container-image - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version") %]-bin.zip name: gradle - sha256sum: 23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f + sha256sum: '[% c("var/gradle_sha256sum") %]'

1 0

[tor-browser-build/maint-10.0-android] Bug 40156: The old jaxb-parent-2.2.11.pom got resurrected
by sysrqb＠torproject.org 12 Dec '20

12 Dec '20

commit c154b2d38eb884c868b8dc72a197b3ab2a47bf75 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 3 07:51:56 2020 +0000 Bug 40156: The old jaxb-parent-2.2.11.pom got resurrected --- projects/geckoview/gradle-dependencies-list.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/geckoview/gradle-dependencies-list.txt b/projects/geckoview/gradle-dependencies-list.txt index f60620b..d9d886a 100644 --- a/projects/geckoview/gradle-dependencies-list.txt +++ b/projects/geckoview/gradle-dependencies-list.txt @@ -65,7 +65,7 @@ c33e67a0807095f02a0e2da139412dd7c4f9cc1a4c054b3e434f96831ba950f4 | https://jcent ebe7137b5fbfd050545f9a7f3f339ae55beb0b53755071b4fd62aa024c626d1c | https://jcenter.bintray.com/com/sun/istack/istack-commons-runtime/2.21/ista… c3071277f89b162982606b4e65c92077212efb6cbf1bdc365c51bd0b57ac818c | https://jcenter.bintray.com/com/sun/istack/istack-commons/2.21/istack-commo… b25e0693de21cb92b039a2e4608f396590fb8773108f10d6dc9f1465f03b5be9 | https://jcenter.bintray.com/com/sun/xml/bind/jaxb-bom-ext/2.2.11/jaxb-bom-e… -010b745ee463eb822ceca023089d00708f021811eb3c285fbba72a3b564a0774 | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-parent/2.2.11/jaxb-pa… +b5301b711c01547e571b615f9a0832ee525d34a4ce3372f53907a87cf20b0480 | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-parent/2.2.11/jaxb-pa… 21918cb8e4eda67f24251e909a5d81672201d93604c4ffbf33522ad836a58e90 | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.2.11… 9a398c699a5d3f3b56f1056c68890ede25d94a12d98eabc2a473733e6ab2362c | https://jcenter.bintray.com/com/sun/xml/bind/mvn/jaxb-txw-parent/2.2.11/jax… 27a77db909f3c2833c0b1a37c55af1db06045118ad2eed96ce567b6632bce038 | https://jcenter.bintray.com/com/sun/xml/fastinfoset/FastInfoset/1.2.13/Fast…

1 0

[tor-browser-build/maint-10.0-android] Bug 40156: Update android-components to 67.0.3 for Fenix 84
by sysrqb＠torproject.org 12 Dec '20

12 Dec '20

commit 5531a057f055b95d607b2127dc4767278a2ef0b2 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Nov 28 14:12:22 2020 +0000 Bug 40156: Update android-components to 67.0.3 for Fenix 84 --- projects/android-components/config | 5 +- .../gradle-dependencies-list.txt | 84 ++++++++++++---------- 2 files changed, 48 insertions(+), 41 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index 81d99cd..f14d2b3 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -8,13 +8,14 @@ gpg_keyring: torbutton.gpg variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]' var: - android_components_version: 63.0.9 + android_components_version: 67.0.3 torbrowser_branch: 10.0 container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 10 + gradle_dependencies_version: 11 # Switch to make it easier to grab all dependencies during a dry-run. + # Note: Use the commit before support for new GeckoView interfaces gets added. fetch_gradle_dependencies: 0 targets: diff --git a/projects/android-components/gradle-dependencies-list.txt b/projects/android-components/gradle-dependencies-list.txt index 39c8a4e..40dec93 100644 --- a/projects/android-components/gradle-dependencies-list.txt +++ b/projects/android-components/gradle-dependencies-list.txt @@ -366,51 +366,54 @@ a6d50f0321bdb52838c99136930c8dcc78c3074a592d526862ec01be91fa622b | https://jcent b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/7/oss-parent-7.pom 13009fb5ede3cf2be5a8d0f1602155aeaa0ce5ef5f9366892bd258d8d3d4d2b1 | https://jcenter.bintray.com/org/yaml/snakeyaml/1.23/snakeyaml-1.23.jar 1e1beb22ca906209700122b5cacf6f2719324538c5b1e3c27bf91564c8d31dbd | https://jcenter.bintray.com/org/yaml/snakeyaml/1.23/snakeyaml-1.23.pom -3520e710bea6a79317db7ffcba1ab03e54696dc154550d7101220adb329232b5 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… -bbfc48708d67383ffeb65ff20416b0477e378edb8319c6e8802c887f12a27333 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… -032545e2abad022bac2192d9c11bba9439f954b5c939a1b15d8fb9d78aeb3bc5 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/63.0… -ede284cc085fde78fb2650cb48a0bb537272cf76425eeeaf76b44309aa8ac1b4 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/63.0… -d32cf0439223b97424243d4516b044301494f698e17d80c44241e19c97423f5f | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/63.0.0/f… -9d35aecc1770669c5a253749212a254fca379f40f87eda8e38b53a210ec4bdca | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/63.0.0/f… -e879e577aba4210949e4b10eb4013f451c270c6d174c61ff518933812ed1cefa | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/63.0.0/… -642ab85c85ef07bbac292638935f5db527ca457ac98862fe60821a4f246cab8a | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/63.0.0/… -6dc4870a15a866112e0fd960f9a14be6c65ea1ae7b85f18e0fd08f8001a13881 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/63.0.0/logi… -06e78f40e5c2db1e6bcb275b5d2b2c26f83b1f096e88273c2c11819f9f4db1e3 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/63.0.0/logi… -e31ec1cc55287f27e6eac65e31aff5306df5667ba35e7e0b90e5530c9d5e2ddc | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/63.… -68c16f560c397b55e46b6a46791391452f4c4212b720627c440f36c8d25f11a3 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/63.… -9ae67ef84b6b9c1f446f98b4d08e18a82fa8d1222e708ef3043cdc841cc08aaa | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/63.0.0/plac… -c864a036385df7254d11e8c92fc78cf7e4f18ba64fc175aa7a641eb7eb997b0b | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/63.0.0/plac… -8f1a4aa9adef85c557f831c65ffb6fe7d3a3b20d09303f753799628f8d138644 | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/63.0.0/push-6… -b87499e129d7bcfd13ad228ef131b16bd4d83f4566a208555a3004194c9cef9b | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/63.0.0/push-6… -77a6a0f3ec7b2d9f0dec6476ef8dd930bbd403829bc4f73eca6100b9834f5d7f | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/63.0.0/rus… -5341bf383990d4cbeb19b6cb972f65f30050ac9c73558ab94018a98fff4811b3 | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/63.0.0/rus… -d583c72e82c4dc62c0ee4140e2c7e253e609c890f1c8c7dda5fb7ae726c04479 | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/63.0.0/sync… -1ff2d3d757cd63f6b240b7ed5604810f70e97bdb5f314f8600a3f443be97cf8e | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/63.0.0/sync… -83bff9bafc078bb36ac3cf0db9d1ec1fcebc5aefb4ab2f76e5bcdf35752cf5d6 | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/63.0.0… -7cc2954d065c14e1a7cb49f8a4fb9b330f76c4ebc625d50f8a00d53e5f74bbbe | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/63.0.0… -53f24189f0cff54e7b4937b6fd1e990b1ff8d9a52e8cc2b254852dabe08d1903 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/63.0.0/tabs-6… -a35dd95abca6750f590232a723f177c499b98c9640735ab1ab660327a4d0e3b1 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/63.0.0/tabs-6… -e14c614b65ae4fe6c6d26ce369d523cf1ff837ce697e5e3f47e8cdfa355357f9 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/56.0.… -e7bd7b2e2013a080bcb3cb9db974185eb28dd87c0594394f951a51ab5d6fcf5d | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/56.0.… -e79f67b5180f06a4680ffea310ceb2c5b0af205a88b3fb1cc76ce96e5b4a7ea7 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/56.0.… -32acc51221752051a03765ac0bbf26a1da663ba2f7b3fe69ae422d5aac228f81 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/56.0.… -ae35db5670efe458d3b9646cab337f2f7667becacdb023b599cc62bfa95b59ec | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/56.0.0… -d87cd2eea092430c4e5a95ff04c3213be89f54aa61c2c7f80fb6548e6dc38bab | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/56.0.0… -96aeede35017fd79576c5faa1cb41efc8137616e20231b41934999ca711f4407 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/56.0.0/… -dbd706151fe820ed233792a6773b70efcceb42987c209e27575ef91d4552b8c4 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/56.0.0/… -22934a560b0bc34f01304efbdccc988d2e0fca039ae577894fcec52a7fdfd88e | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/56.0.… -a2c1e39e5e58f585c2908af2266953b6b43e51f2fabe45e7723bc177c9c49bc0 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/56.0.… -677281ce6616d67c6711dfdd594b7c7e318ddb6d2df1dbeaaa74e66e089dfe97 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/83.0.… -a2c7bc151dd1b3acafbcf718fa4da42a388ce3324fb9fcee93727dc9ea006366 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/83.0.… -92ba04c556a1ad2e68c4df484325bb80356cebfb0acd8199e363d8e952b08a8f | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/84… -ebdd8cd37e94d73d16bec80e21766c72ad8980449d7033a5dd507dd5ca9a0695 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/84… +24851cb6b6377b60f8eab2bcb76035d3d1b7273453d9769ce24b6eb0d5ab50b6 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… +5667db4943399b29f6d6ef9258b4b53bc1e0a9b2f8090acb5631a68f143a6970 | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… +d5295ea2c6455c4a60acff8be5f0deb76c88c4a76d0299c032f56fb0746a882c | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/67.0… +8eff792fa2d20f825d814a0bf82282c8d3f5ac9f6064b4774586428e844ce9bf | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord/67.0… +28e68c69470327c222dcb15e5a438687a311893f8ca3547bad0e8c4d3ad2dd4d | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/67.0.0/f… +1b40ccb140dd16dcc87b4dde3e6d9933a3f81b563d280a400dc8c9b0db503595 | https://maven.mozilla.org/maven2/org/mozilla/appservices/fxaclient/67.0.0/f… +c4f6cd56691aefecab314943e34044b75fcd1cfa836391a8a9ab11e08b6cca31 | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/67.0.0/… +d71959426b165033d0493edb6a966fccaae9354058a0178b3543afc924b9113b | https://maven.mozilla.org/maven2/org/mozilla/appservices/httpconfig/67.0.0/… +a104ca1f58251396566e50488fbea2536e49ebf7aa6a3fc411d9d4a5f0a59253 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/67.0.0/logi… +42eac65ea1459e06d17c88eacd3370f955535666a73d2462af28237481809149 | https://maven.mozilla.org/maven2/org/mozilla/appservices/logins/67.0.0/logi… +fa8d2f9ab6a387a164e0c0b78fd72012db661b3d43848f778fb9288f17de0e52 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/67.… +a25de800b72bd79fc86091de4f02bc7112ee8001d4fadab1d2e5eec04216f329 | https://maven.mozilla.org/maven2/org/mozilla/appservices/native-support/67.… +69568fc1ef5a6d1f6dfafc9318dc450e27298c7ca43e4a73c6907a680fb170ec | https://maven.mozilla.org/maven2/org/mozilla/appservices/nimbus/67.0.0/nimb… +9e7cc45b9f8cc49d4e6043dd3ab038ddabdd4690e0f62be8231b3f8e684b0e55 | https://maven.mozilla.org/maven2/org/mozilla/appservices/nimbus/67.0.0/nimb… +1a8e9af6c928f1244a748c478d82dd4850e3a22e3374aa59ace46dc394a3e5e8 | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/67.0.0/plac… +f025a2b516d8abfb3e1a5fe12a8aba3920de6125d3a4f35f87fb823923264325 | https://maven.mozilla.org/maven2/org/mozilla/appservices/places/67.0.0/plac… +f452730e5ef848c766f50c947da9de88d710ab1404928ba14d2d0a009b4f9446 | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/67.0.0/push-6… +83bea59bc8ae69a81203ca26be9ef3ba152d71c46b3b8d12e10517d66ff894bb | https://maven.mozilla.org/maven2/org/mozilla/appservices/push/67.0.0/push-6… +7cd7c6e40712102fc0125b1e727b936d56fcdc566869856c48f8ddf82372d04b | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/67.0.0/rus… +8baa9f46d2006487df58eea1d7ac1d9a067ac945185dadb4cc4014674f97afe1 | https://maven.mozilla.org/maven2/org/mozilla/appservices/rustlog/67.0.0/rus… +57c4acea81f73043ab62dd4dc341a524d38682d6bc2e69bb48822f9e0ac7f48b | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/67.0.0/sync… +424ff6b5d73e73c00d043e52d9a8c61fc4697414de695475daedaeb954eff58f | https://maven.mozilla.org/maven2/org/mozilla/appservices/sync15/67.0.0/sync… +3dbd2e317902f43e2b769d88ccfa746efc00de13e3e7d34de472f299bfe45fe4 | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/67.0.0… +5e111cc168f358063e9eb0b818bb5713dcb611626785b48a56530f3859028936 | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/67.0.0… +1711bd6a0be32d1912b3d3580cd4eed193fbb9a8a56485c758191d13b46b04dd | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/67.0.0/tabs-6… +6dc1fac81215b05b347e343181cd691a0c27cb34465ed2ea818785901616408f | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/67.0.0/tabs-6… +e00994073f2c041891e511707ce991a7671b335f8863099719eb749897c231b9 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/63.0.0… +f16249682aa48169d0508bd5310778241f856df91b57201a99ad78d0b4741f34 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/63.0.0… +be10c6c12568bfb4ce987756c6bfcf60ce01085a2dab185e0aef8092cd5c779c | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/63.0.… +ea6cb3d94121d03fefd5329072c7b01d891b8bb25c2c303b28dfd6728eeaa72f | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/63.0.… +377092988061736b0a6e8ddfd243fb9766598724abe0153767310ad2b0be86f5 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/63.0.… +45ea21040eadcdce28620267916dc6fd7c252ec54bed1bbefb8f5b6b456e6a5c | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/63.0.… +6215b79ff57a56a1ec3f1937ce9870614f96b5afc3e54837d48239b74a28c185 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/63.0.0… +6a80782f831863c5c592cf2851cbec06f0661a868bca960512b0cc920711bddb | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/63.0.0… +9eadd1526848b5669c6e00bfc4283eb63c2d2c1179db5c1329cca2a2e227003a | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/63.0.0/… +ca3c96c281e314f07170bbfa766693ef0d2e4d865433a9622254088ee7e68363 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/63.0.0/… +93fd44998bfeeab9d7137cb34a50d510876ec8362e988b8a4ddf4e1629a69e71 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/63.0.… +b3836516ae7c9f1ca38ce636e24e3d10b2b421d94e344f14033daa5f20df3168 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/63.0.… +890903424985d557db73823536a836a58773ed47a9c65dc775ca125eec3ede57 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/84.0.… +361a5ae1f624fed319ccfb2802957ffc4e8d1446d56e324e25016bea579be00a | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/84.0.… +1c31f1578080c35980d5b4b64bc19304f72de57c3b106390efa4e32e6a71b6f4 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/85… +fe749823ecc6db346ce5b569c0f6db253389deb94388d401dbaf41b541397120 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/85… 28ceb55db8f63fa227796b145711518d4742572c65b769cd9f40e5d26c778f8b | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/83.0.20201… 50ac68fbcf91585192eaafed5264e4c05860f3510052c60572d8cc2d5d182046 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/83.0.20201… e3b779d5f79c8012d62d3e43bfc2d577ca65439bcf7181c8ec333d0f3fc76890 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… 6e0b82e4ed2fec26de9c9e68d6fa237d716177d9f9e7f6b1213699d7f55e73e6 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… 5eb5d86577ecf64ba66df368c07dde772d1e82da63f25d73e63118d261ca7a7c | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… d1a407ad60d86df547ca4521ed5355e609bbe09f22ef658c89cade0780468994 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… -64371d71a4fb11d63d2a5ff60149c94c1d0e0b909de09ffe199f6872663976b2 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/32.1.1/glean-3… a1925b30aed9675e339205797eebd0598885cc987fc61890e81f4a2c12dcf6b6 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.0.4/glean-3… 477ee8ea2f4bbcf2860553987f3e5fddaac7cfd6bcae7c1bef7a7b29cdc5d9d8 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/33.0.4/glean-3… 8f1fec72b91a71ea39ec39f5f778c4d1124b6b097c6d55b3a50b554a52237b27 | https://plugins.gradle.org/m2/com/google/code/gson/gson-parent/2.8.5/gson-p… @@ -635,6 +638,9 @@ aafe6935d6bedb89a6aa32563d441fbe305da1de193d6f71a45a0212acf9b756 | https://repo. 12ef4a3c2ea685c9c816caa6a77ae8f17bb7727d8460f249925409acda270101 | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.5.0/jna-5.5.0.a… b308faebfe4ed409de8410e0a632d164b2126b035f6eacff968d3908cafb4d9e | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.5.0/jna-5.5.0.j… a51ad94e3f74f85a3cdfad975392829316452669f588203c7b49e5f8179be539 | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.5.0/jna-5.5.0.p… +2b9f3497218b32c399d1ecbea0b00d4f4553edcf669919ed1e1a87daa77acf87 | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.6.0/jna-5.6.0.a… +5557e235a8aa2f9766d5dc609d67948f2a8832c2d796cea9ef1d6cbe0b3b7eaf | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.6.0/jna-5.6.0.j… +5fe81b0255978f24616d37b10608b79498a5f3073e1d9b2038d8736a831f2608 | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.6.0/jna-5.6.0.p… 281440811268e65d9e266b3cc898297e214e04f09740d0386ceeb4a8923d63bf | https://repo.maven.apache.org/maven2/net/java/jvnet-parent/1/jvnet-parent-1… 30f5789efa39ddbf96095aada3fc1260c4561faf2f714686717cb2dc5049475a | https://repo.maven.apache.org/maven2/net/java/jvnet-parent/3/jvnet-parent-3… 1af699f8d9ddab67f9a0d202fbd7915eb0362a5a6dfd5ffc54cafa3465c9cb0a | https://repo.maven.apache.org/maven2/net/java/jvnet-parent/5/jvnet-parent-5…

1 0

[tor-browser-build/maint-10.0-android] Bug 40163: Avoid checking hash of .pom files
by sysrqb＠torproject.org 12 Dec '20

12 Dec '20

commit c9dc3e2db6f952db44a5a01388c46c54d69f3221 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Dec 3 19:17:46 2020 +0000 Bug 40163: Avoid checking hash of .pom files A pom file of hosted third-party dependencies may be modified at any time after publication. These files contain metadata about a version of a repository. We avoid computing and verifying the hash of downloaded .pom files that are listed in a project's gradle-dependencies-list.txt because they change unpredictably. This should be safe while the .pom file is not modified in such a way that it is rejected by gradle and while we still check the hash of non-.pom files. --- projects/common/fetch-gradle-dependencies | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/common/fetch-gradle-dependencies b/projects/common/fetch-gradle-dependencies index 0acd38a..9f18302 100644 --- a/projects/common/fetch-gradle-dependencies +++ b/projects/common/fetch-gradle-dependencies @@ -10,7 +10,11 @@ m2dir="$(mktemp -d)" artifact_filename=$(basename "$artifact_path") artifact_dirname=$(dirname "$artifact_path") [% GET c("urlget", { filename => 'downloaded_file', URL => artifact.url}); %] - echo "[% artifact.sha256sum %] downloaded_file" | sha256sum -c + # .pom files may be modified after a version is published, therefore verify + # the hash only if the file name does not end with '.pom'. + if ! echo "$artifact_filename" | grep -q '\.pom$'; then + echo "[% artifact.sha256sum %] downloaded_file" | sha256sum -c + fi mkdir -p "$m2dir/$artifact_dirname" mv -f downloaded_file "$m2dir/$artifact_dirname/$artifact_filename" [% END -%]

1 0

[tor-browser-build/maint-10.0-android] Bug 40166: Update apt cache before calling pre_pkginst in container-image config
by sysrqb＠torproject.org 12 Dec '20

12 Dec '20

commit 8fc49f50a6f587a9b99b4c9387c2c35a7e7700d2 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Dec 4 14:44:29 2020 +0000 Bug 40166: Update apt cache before calling pre_pkginst in container-image config Thanks to boklm for the suggestion in #23631 --- projects/container-image/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/container-image/config b/projects/container-image/config index 3abba6c..e8f3f38 100644 --- a/projects/container-image/config +++ b/projects/container-image/config @@ -27,10 +27,10 @@ pre: | # [% c('var/container/suite') %] set -e export DEBIAN_FRONTEND=noninteractive + apt-get update -y -q [% IF pc(c('origin_project'), 'var/pre_pkginst') -%] [% pc(c('origin_project'), 'var/pre_pkginst') %] [% END -%] - apt-get update -y -q apt-get upgrade -y -q [% deps = [];

1 0

[tor-browser-build/maint-10.0-android] fixup! Bug 40128: Allow updating Fenix allowed_addons.json
by sysrqb＠torproject.org 12 Dec '20

12 Dec '20

commit 274191caff780b14c5d2071b4ed11f32a3e22ebe Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Dec 4 15:45:44 2020 +0100 fixup! Bug 40128: Allow updating Fenix allowed_addons.json --- projects/tor-browser/build.android | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index 3e76614..71b9d36 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -17,9 +17,9 @@ unzip -d $ext_dir/https-everywhere $rootdir/[% c('input_files_by_name/https-ever mv $rootdir/[% c('input_files_by_name/noscript') %] $ext_dir/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi [% IF c("var/verify_allowed_addons") %] -# Check that allowed_addons.json contains the right versions of NoScript and HTTPS Everywhere -# If so, replace the default allowed_addons.json by ours in the apk assets folder. -$rootdir/verify_allowed_addons.py "$rootdir/allowed_addons.json" "$ext_dir/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" "$rootdir/[% c('input_files_by_name/https-everywhere') %]" + # Check that allowed_addons.json contains the right versions of NoScript and HTTPS Everywhere + # If so, replace the default allowed_addons.json by ours in the apk assets folder. + $rootdir/verify_allowed_addons.py "$rootdir/allowed_addons.json" "$ext_dir/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" "$rootdir/[% c('input_files_by_name/https-everywhere') %]" [% END %] mv $rootdir/allowed_addons.json $assets_dir/allowed_addons.json

1 0

[tor-browser-build/maint-10.0-android] Bug 40167: Update GeckoView to 84.0b7
by sysrqb＠torproject.org 12 Dec '20

12 Dec '20

commit 37c40104c69adb5e4cdc0c946597f473ed776059 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Dec 4 17:57:24 2020 +0000 Bug 40167: Update GeckoView to 84.0b7 --- projects/geckoview/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/geckoview/config b/projects/geckoview/config index 5ac9141..f67fa19 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - geckoview_version: 84.0b1 + geckoview_version: 84.0b7 torbrowser_branch: 10.0 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps:

1 0

[tor-browser-build/maint-10.0-android] Bug 40176: Update OpenSSL to 1.1.1i
by sysrqb＠torproject.org 12 Dec '20

12 Dec '20

commit c3fb1bc7f11cf1be6f9108f317466b5d9d7c838a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Dec 10 21:55:16 2020 +0000 Bug 40176: Update OpenSSL to 1.1.1i --- projects/openssl/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index 45b4fd6..c753485 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1h +version: 1.1.1i filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -31,4 +31,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9 + sha256sum: e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242

1 0