[builders/tor-browser-build] branch maint-11.5 updated (25c2068 -> f63875f)

List overview All Threads
Download

newer

older

[builders/tor-browser-build]...

[tor-browser] branch...

gitolite role

8 Oct 2022 8 Oct '22

5:19 p.m.

This is an automated email from the git hooks/post-receive script.

pierov pushed a change to branch maint-11.5 in repository builders/tor-browser-build.

from 25c2068 fixup! Bug 40629: Bump snowflake version to 9ce1de4eee4e new 903e43e Update rbm for rbm#40043 new 2479296 Bug 40608: Updated TBA toolchains for 11.5.4 new f63875f fixup! Bug 40608: Prepare stable release 11.5.4

The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.

-- To stop receiving notification emails like this one, please contact the administrator of this repository.

Show replies by date

gitolite role

8 Oct 8 Oct

5:19 p.m.

New subject: [builders/tor-browser-build] 01/03: Update rbm for rbm#40043

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch maint-11.5 in repository builders/tor-browser-build.

commit 903e43e059087e2b08ae66c96b5316f177ff8933 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Sat Oct 8 07:19:02 2022 +0200

Update rbm for rbm#40043 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rbm b/rbm index e93302b..c485326 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit e93302bd80b80dd498a91cd018bcb4c81638b546 +Subproject commit c48532692f8c5a412da891b3d43bd46a24cd179e

-- To stop receiving notification emails like this one, please contact the administrator of this repository.

gitolite role

5:19 p.m.

New subject: [builders/tor-browser-build] 02/03: Bug 40608: Updated TBA toolchains for 11.5.4

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch maint-11.5 in repository builders/tor-browser-build.

commit 2479296204120fa7adcdeb25f01c6750f75142b3 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Sat Jul 23 18:07:41 2022 +0200

diff --git a/projects/android-components/build b/projects/android-components/build index 85ac597..68c5057 100755 --- a/projects/android-components/build +++ b/projects/android-components/build @@ -22,6 +22,8 @@ EOF cp -r $gradle_repo/dl/android/maven2/* $gradle_repo cp -r $gradle_repo/maven2/* $gradle_repo cp -r $gradle_repo/m2/* $gradle_repo + mkdir /home/rbm/.m2 + ln -s $gradle_repo /home/rbm/.m2/repository # Put the Kotlin/Native compiler at the right place, see: # tor-browser-build#40217. kotlin_dir=/home/rbm/.konan @@ -67,6 +69,11 @@ sed -i 's/tag = getGitHash()/tag = "[% c('abbrev') %]"/' publish.gradle # Increase the maximum memory usage, for when compiling with --disable-install-strip gradle_args="--offline --no-daemon -Dmaven.repo.local=$gradle_repo -Dorg.gradle.jvmargs=-Xmx8g"

+ # See taskcluster/scripts/toolchain/android-gradle-dependencies.sh at line 36. + # We hit the same problem when we run online to discover dependencies, but + # since it works also for offline builds, we just leave it here + gradle $gradle_args support-sync-telemetry:assemble + gradle $gradle_args assembleGecko -x lint gradle $gradle_args publish

diff --git a/projects/android-components/config b/projects/android-components/config index c27f679..0dac3ff 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1-build4' +git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1-build1' git_url: https://gitlab.torproject.org/tpo/applications/android-components.git tag_gpg_id: 1 gpg_keyring: torbutton.gpg @@ -10,10 +10,10 @@ container: use_container: 1

use serde::{Deserialize, Serialize}; use serde_json::json; -@@ -22,7 +22,7 @@ pub(crate) struct EnumVariantBody { - #[derive(Debug, Deserialize, Serialize, Clone)] +@@ -24,7 +24,7 @@ pub(crate) struct EnumVariantBody { + #[serde(deny_unknown_fields)] pub(crate) struct EnumBody { description: String, - variants: HashMap<String, EnumVariantBody>, @@ -20,7 +20,7 @@ index 1de9a301..19d29373 100644 }

#[derive(Debug, Deserialize, Serialize, Clone)] -@@ -39,26 +39,26 @@ pub(crate) struct FieldBody { +@@ -43,23 +43,23 @@ pub(crate) struct FieldBody { pub(crate) struct ObjectBody { description: String, failable: Option<bool>, @@ -29,14 +29,18 @@ index 1de9a301..19d29373 100644 }

#[derive(Debug, Deserialize, Serialize, Clone, Default)] + #[serde(deny_unknown_fields)] pub(crate) struct Types { + #[serde(default)] - enums: HashMap<String, EnumBody>, -- objects: HashMap<String, ObjectBody>, + enums: BTreeMap<String, EnumBody>, + #[serde(default)] +- objects: HashMap<String, ObjectBody>, + objects: BTreeMap<String, ObjectBody>, }

#[derive(Debug, Deserialize, Serialize, Clone)] + #[serde(deny_unknown_fields)] pub(crate) struct FeatureBody { description: String, - variables: HashMap<String, FieldBody>, @@ -44,11 +48,12 @@ index 1de9a301..19d29373 100644 #[serde(alias = "defaults")] default: Option<serde_json::Value>, } - #[derive(Debug, Deserialize, Serialize, Clone, Default)] - pub(crate) struct ManifestFrontEnd { - types: Types, +@@ -71,7 +71,7 @@ pub(crate) struct ManifestFrontEnd { + #[serde(default)] + #[serde(rename = "types")] + legacy_types: Option<Types>, - features: HashMap<String, FeatureBody>, + features: BTreeMap<String, FeatureBody>, channels: Vec<String>, - }

+ // If a types attribute isn't explicitly expressed, diff --git a/projects/application-services/build b/projects/application-services/build index 121dc12..d4b1098 100755 --- a/projects/application-services/build +++ b/projects/application-services/build @@ -33,7 +33,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz # 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 application-services-vendor-[% c('version') %].tar.bz2 +tar -C $builddir -xf $rootdir/[% c('input_files_by_name/cargo_vendor') %] cd $builddir # Make sure our vendored crates are used for offline builds. cat >> .cargo/config << 'EOF' diff --git a/projects/application-services/config b/projects/application-services/config index 4e7427c..a6c0499 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -1,7 +1,8 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 91.1.1 -git_hash: 17942945873cdb8be56a9316d3cb8a611b3ef321 +# Remember to update the Cargo vendor archive, when updating +version: 93.1.0 +git_hash: ae2bb5ae89f9818230bbc003819fc7b9775aae26 git_url: https://github.com/mozilla/application-services git_submodule: 1 container: @@ -90,8 +91,9 @@ input_files: sha256sum: '[% pc("glean", "var/glean_wheels_sha256sum/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]' enable: '[% !c("var/fetch_gradle_dependencies") %]' # Use `make cargo_vendor-application-services` to re-generate the vendor tarball - - URL: https://people.torproject.org/~aguestuser/mirrors/sources/application-servic... c('version') %].tar.bz2 - sha256sum: 621fef6c07bbb0b165cbc4dfa44176ff7d1d04557f7c418a0a809a29099c6440 + - name: cargo_vendor + URL: https://people.torproject.org/~pierov/mirrors/sources/application-services-v... c('version') %].tar.xz + sha256sum: cc426afe8cc3602f223213a93d3c1dffc156793b68b9c8a89f41715068d533fb - filename: no-git.patch - filename: mavenLocal.patch enable: '[% !c("var/fetch_gradle_dependencies") %]' @@ -102,7 +104,7 @@ input_files:

steps: list_toolchain_updates: - git_hash: 'v91.1.0' + git_hash: 'v[% c("version") %]' input_files: [] container: use_container: 0 @@ -130,7 +132,7 @@ steps: fetch_gradle_dependencies: 1

cargo_vendor: - filename: '[% project %]-vendor-[% c("version") %].tar.bz2' + filename: '[% project %]-vendor-[% c("version") %].tar.xz' input_files: - project: container-image pkg_type: build diff --git a/projects/cbindgen/build b/projects/cbindgen/build index 2a1c9e0..ee54a09 100644 --- a/projects/cbindgen/build +++ b/projects/cbindgen/build @@ -11,7 +11,7 @@ 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 cbindgen-vendor-[% c('version') %].tar.bz2 +tar -C $builddir -xf $rootdir/[% c('input_files_by_name/cbindgen_vendor') %] cd $builddir mkdir .cargo cat > .cargo/config << 'EOF' diff --git a/projects/cbindgen/config b/projects/cbindgen/config index 65c77e4..3f9e38d 100644 --- a/projects/cbindgen/config +++ b/projects/cbindgen/config @@ -1,16 +1,17 @@ # vim: filetype=yaml sw=2 version: '[% c("var/cbindgen_version") %]' git_url: https://github.com/eqrion/cbindgen -git_hash: '[% c("var/cbindgen_hash") %]' +git_hash: '[% c("var/cbindgen_git_hash") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1

var: cbindgen_version: 0.19.0 - cbindgen_hash: d9e490ce8b836194595bd30611253a7028059da2 + cbindgen_git_hash: d9e490ce8b836194595bd30611253a7028059da2 cbindgen_vendor_hash: 7d99c195b180e28ca7499d8744d020b864f952a5ba699716707aec9a06b4ee8b cbindgen_vendor_people_tpo_user: boklm + vendor_compress: bz2

input_files: - project: container-image @@ -19,12 +20,22 @@ input_files: # `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/~%5B% c('var/cbindgen_vendor_people_tpo_user') %]/mirrors/sources/cbindgen-vendor-[% c('version') %].tar.bz2 + - name: cbindgen_vendor + URL: https://people.torproject.org/~%5B% c('var/cbindgen_vendor_people_tpo_user') %]/mirrors/sources/cbindgen-vendor-[% c('version') %].tar.[% c('var/vendor_compress') %] sha256sum: '[% c("var/cbindgen_vendor_hash") %]'

+targets: + android: + var: + cbindgen_version: 0.23.0 + cbindgen_git_hash: 798cfab52bced65a749443faa16990ec3a8e0cfe + cbindgen_vendor_hash: 90fc3483753d296c6fc1a406f5cae412f7f74cd6719e9c800a2ffc6cd18b6e69 + cbindgen_vendor_people_tpo_user: pierov + vendor_compress: xz + steps: cargo_vendor: - filename: '[% project %]-vendor-[% c("version") %].tar.bz2' + filename: '[% project %]-vendor-[% c("version") %].tar.xz' input_files: - project: container-image pkg_type: build diff --git a/projects/clang/build b/projects/clang/build index 241a7f1..b96166c 100644 --- a/projects/clang/build +++ b/projects/clang/build @@ -26,40 +26,51 @@ cd clang-source export LLVM_HOME=$(pwd) mkdir build cd build + +[% IF c("var/android") %] +libcxx="" +[% ELSE %] +libcxx=";libcxx;libcxxabi" +[% END %] + cmake ../llvm -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \ -DCMAKE_BUILD_TYPE=Release \ [% IF c("var/android") -%] -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64" \ [% END -%] [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly[% END %] \ - -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt;libcxx;libcxxabi;lld" + -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt;lld$libcxx" make -j[% c("num_procs") %] make install +cd ..

[% IF c("var/android") -%] + echo "Compiling compiler-rt (Android only)" rtdistdir=/var/tmp/build/rtdist mkdir $rtdistdir

make_compilerrt () { - cd .. mkdir "build-compilerrt-$1" cd "build-compilerrt-$1" cmake ../compiler-rt/ -G "Unix Makefiles" \ -DCMAKE_INSTALL_PREFIX=$rtdistdir \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SYSTEM_NAME=Android \ -DCMAKE_ANDROID_ARCH_ABI=$1 \ - -DCMAKE_ANDROID_NDK="/var/tmp/dist/android-toolchain/android-sdk-linux/ndk/android-ndk-r21d" \ + -DCMAKE_ANDROID_NDK="$ANDROID_NDK_HOME" \ -DCMAKE_C_FLAGS="$3 -fuse-ld=lld --rtlib=compiler-rt" \ -DCMAKE_CXX_FLAGS="$3 -fuse-ld=lld --rtlib=compiler-rt" \ - -DCMAKE_EXE_LINKER_FLAGS="-L/var/tmp/dist/android-toolchain/android-sdk-linux/ndk/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64/$2" \ + -DCMAKE_EXE_LINKER_FLAGS="-L$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/$2" \ -DCOMPILER_RT_BUILD_BUILTINS=ON \ -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \ -DCOMPILER_RT_BUILD_MEMPROF=OFF \ + -DCOMPILER_RT_BUILD_ORC=OFF \ -DCOMPILER_RT_BUILD_PROFILE=OFF \ -DCOMPILER_RT_BUILD_SANITIZERS=OFF \ -DCOMPILER_RT_BUILD_XRAY=OFF make -j[% c("num_procs") %] make install + cd .. }

make_compilerrt "armeabi-v7a" "arm-linux-androideabi/lib" "-DARMEABI_V7A" @@ -67,7 +78,7 @@ make install make_compilerrt "x86" "i686-linux-android/lib" make_compilerrt "x86_64" "x86_64-linux-android/lib64"

- mv $rtdistdir/lib/android/*.a $distdir/lib/clang/[% c("var/llvm_version") %]/lib/linux/ + mv $rtdistdir/lib/linux/libclang_rt.builtins-*-android.a $distdir/lib/clang/[% c("var/llvm_version") %]/lib/linux/ [% END -%]

cd /var/tmp/dist diff --git a/projects/fenix/config b/projects/fenix/config index 81d73f9..e625e60 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'fenix-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1-build4' +git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1-build1' git_url: https://gitlab.torproject.org/tpo/applications/fenix.git tag_gpg_id: 1 gpg_keyring: torbutton.gpg @@ -10,12 +10,12 @@ container: use_container: 1

-# We unbreak mach, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1656993. -export MACH_USE_SYSTEM_PYTHON=1 +# We unbreak mach, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1656993 and https://bugzilla.mozilla.org/show_bug.cgi?id=1755516 +export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # Create .mozbuild to avoid interactive prompt in configure mkdir "$HOME/.mozbuild" ./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-java-bin-path="$JAVA_HOME/bin" --without-wasm-sandboxed-libraries diff --git a/projects/geckoview/config b/projects/geckoview/config index ac16e7b..a6e32f7 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -25,7 +25,7 @@ var: - openjdk-11-jdk-headless # this should be updated when the list of gradle dependencies is changed # see doc/how-to-create-gradle-dependencies-list.txt - gradle_dependencies_version: 10 + gradle_dependencies_version: 11 gradle_version: 7.3

steps: @@ -82,7 +82,7 @@ steps: cp -r $gradle_repo/m2/* $gradle_repo

# We unbreak mach, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1656993. - export MACH_USE_SYSTEM_PYTHON=1 + export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # Create .mozbuild to avoid interactive prompt in configure mkdir "$HOME/.mozbuild" # We still need to specify --tor-browser-version due to bug 34005. @@ -145,7 +145,7 @@ steps:

targets: nightly: - git_hash: 'geckoview-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-2' + git_hash: 'geckoview-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0

input_files: diff --git a/projects/geckoview/gradle-dependencies-list.txt b/projects/geckoview/gradle-dependencies-list.txt index 3a27234..f73fff0 100644 --- a/projects/geckoview/gradle-dependencies-list.txt +++ b/projects/geckoview/gradle-dependencies-list.txt @@ -275,18 +275,8 @@ fdd93302c2eb94bbe6007caa28d072246d2875cda5cb774bb6299416b94d74a6 | https://maven cf5c277c3a9805c83b79399b31b0d22006f1f01181a1a6bf8544a9c9aa4fbb6f | https://maven.google.com/com/google/android/material/material/1.4.0/material... d2bc7a461351e748444ec816c8350dd908046fa346af60399694a98327d60245 | https://maven.google.com/com/google/testing/platform/core-proto/0.0.8-alpha0... edac09fc7040687eb455c536d7c85cf0a18dc1c7d5671db49bb60eaa0658810f | https://maven.google.com/com/google/testing/platform/core-proto/0.0.8-alpha0... -245596e1b6294d95b8f92c575b215b532e4da246bf71fb92aea36e522d86eda3 | https://plugins.gradle.org/m2/com/diffplug/spotless/spotless-plugin-gradle/5... -cc96b7c15bba0908fe1c191b1326472d48c5a944f3c1724bbfc4972ee520c510 | https://plugins.gradle.org/m2/com/diffplug/spotless/spotless-plugin-gradle/5... -857db5645aaefbd7fbe9ba6454b072bc0518ebaba08a93d5eae89a9850e949c4 | https://plugins.gradle.org/m2/com/getkeepsafe/dexcount/dexcount-gradle-plugi... -15d4b252c5aa3aeb8d634ae5aaf348ac6ce183b6b5e3615364e6c083715c1133 | https://plugins.gradle.org/m2/com/getkeepsafe/dexcount/dexcount-gradle-plugi... -cb49812dc1bfb0ea4f20f398bcae1a88c6406e213e67f7524fb10d4f8ad9347b | https://plugins.gradle.org/m2/org/apache/commons/commons-exec/1.3/commons-ex... -82827f6019c0f71bd74fba886ab337ff6da291f63df9723379a209d6ad3b44f8 | https://plugins.gradle.org/m2/org/apache/commons/commons-exec/1.3/commons-ex... -12c14541231e881cdb04ac349605755ff0f7858d15b19f536c010b1b13c36c0c | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-gradle-plugin/1.5.... -606771b9ee360fdce5bf868ead52e145c530cb4b65cbb56b5b02266d6c6c53fc | https://plugins.gradle.org/m2/org/jetbrains/kotlin/kotlin-gradle-plugin/1.5.... 37cae20c1e1194c48429311331a095ee608cf44f66bd4837d1c1b6d4b770a46b | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.5.1/apilint-0.5.... 0c59672961e1a3dea4018a1faec72fcbb738cf1a06910d42235c7dc0349ba87b | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.5.1/apilint-0.5.... -32697c7567b2921c473678a820b13fc64700aa87bb14576eeb48d0ed5847cfd4 | https://plugins.gradle.org/m2/org/tomlj/tomlj/1.0.0/tomlj-1.0.0.jar -ad8192007f73450c51c880305f14dd22ac551449b721b585fc51231422cb0913 | https://plugins.gradle.org/m2/org/tomlj/tomlj/1.0.0/tomlj-1.0.0.pom 7891debb84b5f83e9bd57593ebece3399abbe0fd938cf306b3534c57913b9615 | https://repo.maven.apache.org/maven2/com/beust/jcommander/1.78/jcommander-1.... 6fee231c0aeee6de1256b6b5590ce9e6f6cf6c39797ed668573520bc3412e2a7 | https://repo.maven.apache.org/maven2/com/beust/jcommander/1.78/jcommander-1.... b194c0b88021cc116c21c1dc76f49c2c1fe175af5bcb74c8ba67b9dbbf9a48cc | https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-collect/1.2.... @@ -299,6 +289,10 @@ b194c0b88021cc116c21c1dc76f49c2c1fe175af5bcb74c8ba67b9dbbf9a48cc | https://repo. 196b4ac310e337fcc632b33b6400b6443fee41bdf968f4a529b43c696f4e3a74 | https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib-extr... 712592b7dd636a901d2cb11fef37215f8a6ab2962fbfbc510ba51ae4f8ca2d6b | https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib/2.19... 5f8e0fe43fe7bbb75016bd447b5d55b97556407bdc951a554589ac89fd724786 | https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib/2.19... +245596e1b6294d95b8f92c575b215b532e4da246bf71fb92aea36e522d86eda3 | https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-plugin-g... +d7dcab5d5321125d77eac07580864d1e6b3d6effbb211c2dca5fbcaf45a8a4f5 | https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-plugin-g... +857db5645aaefbd7fbe9ba6454b072bc0518ebaba08a93d5eae89a9850e949c4 | https://repo.maven.apache.org/maven2/com/getkeepsafe/dexcount/dexcount-gradl... +15d4b252c5aa3aeb8d634ae5aaf348ac6ce183b6b5e3615364e6c083715c1133 | https://repo.maven.apache.org/maven2/com/getkeepsafe/dexcount/dexcount-gradl... 3f59eca516374ccd4fd3551625bf50f8a4b191f700508f7ce4866460a6128af0 | https://repo.maven.apache.org/maven2/com/github/gundy/semver4j/0.16.4/semver... def9b4225fa37219e18f81d01f0e52d73dca1257a38f5475be9dd58f87736510 | https://repo.maven.apache.org/maven2/com/github/gundy/semver4j/0.16.4/semver... 32001db2443b339dd21f5b79ff29d1ade722d1ba080c214bde819f0f72d1604d | https://repo.maven.apache.org/maven2/com/github/gundy/semver4j/0.16.4/semver... @@ -487,6 +481,8 @@ af10c108da014f17cafac7b52b2b4b5a3a1c18265fa2af97a325d9143537b380 | https://repo. 4946e60a547c8eda69f3bc23c5b6f0dadcf8469ea49b1d1da7de34aecfcf18dd | https://repo.maven.apache.org/maven2/org/apache/apache/9/apache-9.pom 0aeb625c948c697ea7b205156e112363b59ed5e2551212cd4e460bdb72c7c06e | https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.2... d95678e3af56b17c7db6cff9645efad5eb59be9f3c1caaaf5f0146edf04691d7 | https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.2... +cb49812dc1bfb0ea4f20f398bcae1a88c6406e213e67f7524fb10d4f8ad9347b | https://repo.maven.apache.org/maven2/org/apache/commons/commons-exec/1.3/com... +82827f6019c0f71bd74fba886ab337ff6da291f63df9723379a209d6ad3b44f8 | https://repo.maven.apache.org/maven2/org/apache/commons/commons-exec/1.3/com... 467ae650442e876867379094e7518dfdd67d22c5352ebd39808c84259e9790ba | https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/25/co... 3a2e69d06d641d1f3b293126dc9e2e4ea6563bf8c36c87e0ab6fa4292d04b79c | https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/34/co... 7098a1ab8336ecd4c9dc21cbbcac869f82c66f64b8ac4f7988d41b4fcb44e49a | https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/35/co... @@ -609,6 +605,8 @@ f61eaf89e5e3848631650b25cdfb66fe8cae0281a054d9d986716000a15ba8d6 | https://repo. 401055f4f347bff374dfe61e3bd7add20bc1e7e6215b44590d946d0c47ce5e88 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... 4e5e36c5bdf60751805c1bdea8341106678e623f0aacb6da2b3d204cdf410661 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... c7f177c0afd72a1fbbc96b52d55fd0cec81f08c9b64a59f4f4515a57df92cbbb | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... +12c14541231e881cdb04ac349605755ff0f7858d15b19f536c010b1b13c36c0c | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... +606771b9ee360fdce5bf868ead52e145c530cb4b65cbb56b5b02266d6c6c53fc | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plug... 10396a595bb8c5e2549030310d30cd51677c58804216a52823a4806819cb0fd7 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-common... ea0f8b14ade33aabe824484ba67037515e4eb88774cd57e7790a8541b5874299 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-common... 7127e069c10636de7842c3f84c2ec6e3f5b7764fa6ddfdeb1395cbbf1ae551c4 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-native-util... @@ -701,6 +699,8 @@ fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a | https://repo. 9a4f5e5674366c156c90391662f03ed7c5971d6aa63832df74a271da6ff82e96 | https://repo.maven.apache.org/maven2/org/tensorflow/tensorflow-lite-metadata... 63727488f9717d57f0d0a0fee5a1fc10a2be9cfcff2ec3a7187656d663c0774e | https://repo.maven.apache.org/maven2/org/testng/testng/7.3.0/testng-7.3.0.ja... d138716ebaf33b9d964f07bf387bb5419f5cba57bff305d5c831e2e7a5a1a4bb | https://repo.maven.apache.org/maven2/org/testng/testng/7.3.0/testng-7.3.0.po... +32697c7567b2921c473678a820b13fc64700aa87bb14576eeb48d0ed5847cfd4 | https://repo.maven.apache.org/maven2/org/tomlj/tomlj/1.0.0/tomlj-1.0.0.jar +ad8192007f73450c51c880305f14dd22ac551449b721b585fc51231422cb0913 | https://repo.maven.apache.org/maven2/org/tomlj/tomlj/1.0.0/tomlj-1.0.0.pom d4e441fda1b3ad70b266793cc4b6d02bec8720875b796fadc063fc713f948549 | https://repo.maven.apache.org/maven2/org/yaml/snakeyaml/1.24/snakeyaml-1.24-... d3f7f09989d5b0ce5c4791818ef937ee7663f1e359c2ef2d312f938aad0763da | https://repo.maven.apache.org/maven2/org/yaml/snakeyaml/1.24/snakeyaml-1.24.... 174d423722256823edbe2af8d7e3385c4645cf72382a22da0485b3b674394f37 | https://repo.maven.apache.org/maven2/org/yaml/snakeyaml/1.24/snakeyaml-1.24.... diff --git a/projects/geckoview/list_toolchain_updates_checks b/projects/geckoview/list_toolchain_updates_checks index 8b296b6..4bc3033 100644 --- a/projects/geckoview/list_toolchain_updates_checks +++ b/projects/geckoview/list_toolchain_updates_checks @@ -115,13 +115,13 @@ check_update_needed min-android "$needed" "$current"

# min_sdk read -d '' p << 'EOF' || true -if (m/^\s*MOZ_ANDROID_MIN_SDK_VERSION\s*=\s*([^\s]+)/) { +if (m/^\s*min_sdk_version="[^"]+" if geckoview_lite else "([^"]+)"/) { print $1; exit; } EOF -needed=$(cat mobile/android/confvars.sh | perl -ne "$p") -current=16 +needed=$(cat build/moz.configure/android-sdk.configure | perl -ne "$p") +current=21 check_update_needed min_sdk "$needed" "$current"

@@ -151,13 +151,12 @@ check_update_needed cbindgen "$needed" "$current"

# nasm read -d '' p << 'EOF' || true -if (m/^\s*MODERN_NASM_VERSION\s*=\s*LooseVersion$"([^"]+)"$/) { - print $1; - exit; -} +my $nasm = YAML::XS::LoadFile('taskcluster/ci/toolchain/nasm.yml'); +my $linux64 = 'linux64-nasm'; +print substr $nasm->{$linux64}{'fetches'}{'fetch'}[0], 5; EOF -needed=$(cat python/mozboot/mozboot/base.py | perl -ne "$p") -current='2.14' +needed=$(perl -MYAML::XS -e "$p") +current='2.15.05' check_update_needed nasm "$needed" "$current"

@@ -233,11 +232,11 @@ check_update_needed node "$needed" "$current"

# python read -d '' p << 'EOF' || true -if (m/find_python3_executable\(min_version\s*=\s*"([^"]+)"/) { +if (m/^\s*"Bootstrap currently only runs on Python ([^"]+)\."/) { print $1; exit; } EOF -needed=$(cat build/moz.configure/init.configure | perl -ne "$p") -current=3.6.0 +needed=$(cat python/mozboot/bin/bootstrap.py | perl -ne "$p") +current="3.5+" check_update_needed python "$needed" "$current" diff --git a/projects/llvm-project/config b/projects/llvm-project/config index cca2caa..1f99f59 100644 --- a/projects/llvm-project/config +++ b/projects/llvm-project/config @@ -6,5 +6,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'

targets: android: - version: 13.0.1 - git_hash: 75e33f71c2dae584b13a7d1186ae0a038ba98838 + version: 14.0.4 + git_hash: 29f1039a7285a5c3a9c353d054140bf2556d4c4d diff --git a/projects/rust/config b/projects/rust/config index 88c542f..981592d 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -11,8 +11,8 @@ var: targets: android: var: - current_version: 1.59.0 - previous_version: 1.58.1 + current_version: 1.60.0 + previous_version: 1.59.0 arch_deps: - libssl-dev - pkg-config diff --git a/projects/sqlcipher/config b/projects/sqlcipher/config index 1bd0059..8dbedf6 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.5.1 container: use_container: 1 var: @@ -24,4 +24,4 @@ input_files: project: nss - URL: 'https://github.com/sqlcipher/sqlcipher/archive/v%5B% c("version") %].tar.gz' name: sqlcipher - sha256sum: 0924b2ae1079717954498bda78a30de20ce2a6083076b16214a711567821d148 + sha256sum: 023499516ef2ade14fbcdbe93fb81cc69458ae6cb3544614df8dbef34835b406 diff --git a/rbm.conf b/rbm.conf index c0d6bf4..8e3b955 100644 --- a/rbm.conf +++ b/rbm.conf @@ -32,8 +32,10 @@ steps: arch: amd64 pre_pkginst: '' deps: - - patch - bzip2 + - ca-certificates + - patch + - xz-utils cargo_vendor: | #!/bin/bash [% c("var/set_default_env") %]

-- To stop receiving notification emails like this one, please contact the administrator of this repository.

gitolite role

5:19 p.m.

New subject: [builders/tor-browser-build] 03/03: fixup! Bug 40608: Prepare stable release 11.5.4

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch maint-11.5 in repository builders/tor-browser-build.

commit f63875fdf8e0e924f5ab19eafc8f689cfd85002c Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Sat Oct 8 12:04:15 2022 +0200

fixup! Bug 40608: Prepare stable release 11.5.4

Bump to build2 and added missing changelog entries for Android. --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ rbm.conf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 654d433..b9317ed 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -14,7 +14,13 @@ Tor Browser 11.5.4 - October 11 2022 * Bug 41307: font whitelist typos [tor-browser] * Android * Updated GeckoView to 102.3.0esr + * Bug 41089: Add tor-browser build scripts + Makefile to tor-browser [tor-browser] + * Bug 41094: Enable HTTPS-Only Mode by default in Tor Browser Android [tor-browser] + * Bug 41159: Remove HTTPS-Everywhere extension from esr102-based Tor Browser Android [tor-browser] + * Bug 41166: Backport fix for CVE-2022-36317: Long URL would hang Firefox for Android (Bug 1759951) [tor-browser] + * Bug 41167: Backport fix for CVE-2022-38474: Recording notification not shown when microphone was recording on Android (Bug 1719511) [tor-browser] * Bug 41302: YEC 2022 Takeover for Android Stable [tor-browser] + * Bug 41312: Backport Firefox 105 Android security fixes to 102.3-based Tor Browser [tor-browser] * Bug 41314: Add YEC 2022 strings to torbutton and fenix [tor-browser] * Build System * Android diff --git a/rbm.conf b/rbm.conf index 8e3b955..92a1eac 100644 --- a/rbm.conf +++ b/rbm.conf @@ -72,7 +72,7 @@ buildconf:

var: torbrowser_version: '11.5.4' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 11.5.2 project_name: tor-browser

-- To stop receiving notification emails like this one, please contact the administrator of this repository.

762

Age (days ago)

762

Last active (days ago)

tor-commits@lists.torproject.org

3 comments

1 participants

tags (0)

participants (1)

gitolite role