- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][main] 6 commits: Bug 40681: Run `apt-get clean` after installing packages
by boklm (＠boklm) 09 Dec '22

09 Dec '22

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 1e4d64eb by Nicolas Vigier at 2022-12-09T11:12:31+01:00 Bug 40681: Run `apt-get clean` after installing packages - - - - - b3972182 by Nicolas Vigier at 2022-12-09T11:12:33+01:00 Bug 40683: Reduce the number of custom containers Install a few more packages in the default containers to reduce the number of custom containers we use. - - - - - ad51122f by Nicolas Vigier at 2022-12-09T11:12:34+01:00 Bug 40689: Update Ubuntu version in projects/mmdebstrap-image to 22.04.1 - - - - - 1c5314b5 by Nicolas Vigier at 2022-12-09T11:12:36+01:00 Bug 40693: Patch apt-key to accept expired keys for jessie - - - - - 5d387c8f by Nicolas Vigier at 2022-12-09T11:12:38+01:00 Bug 40693: use faketime to run `apt-get update` on jessie - - - - - 228a1188 by Pier Angelo Vendrame at 2022-12-09T11:12:39+01:00 Bug 40653: Do not build compiler-rt with Clang Specifying compiler-rt as a project in LLVM is going to be deprecated. It should be compiled with runtimes, instead, or alone, if it will be still allowed. The only platform in which we were compiling compiler-rt with LLVM was Linux. But Firefox seems not to actually use it, and just use GCC's runtime, instead. However, we were also compiling compiler-rt for Android in the same project, which prevents to share the artifact with Windows and macOS. So, I have moved it to another project on its own. - - - - - 23 changed files: - projects/android-components/config - projects/android-toolchain/config - projects/application-services/config - projects/bison/config - projects/browser/config - projects/clang/build - projects/clang/config - + projects/compiler-rt/build - + projects/compiler-rt/config - projects/container-image/config - projects/fenix/config - projects/geckoview/build - projects/geckoview/config - projects/gradle/config - projects/libevent/config - + projects/mmdebstrap-image/apt-key-allow-expired-key.patch - projects/mmdebstrap-image/config - projects/rust/config - projects/tor-android-service/config - projects/tor-onion-proxy-library/config - projects/tor/config - projects/wasi-sysroot/config - rbm.conf Changes: ===================================== projects/android-components/config ===================================== @@ -19,8 +19,6 @@ var: gradle_version: 7.0.2 glean_parser: 5.0.1 git_branch: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1' - arch_deps: - - python3-venv targets: nightly: ===================================== projects/android-toolchain/config ===================================== @@ -8,9 +8,6 @@ var: version_30: 30.0.2 version_29: 29.0.2 version_28: 28.0.3 - deps: - - unzip - - python3 setup: | mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] ===================================== projects/application-services/config ===================================== @@ -13,8 +13,6 @@ var: gradle_dependencies_version: 9 gradle_version: 6.7.1 glean_parser: 4.0.0 - arch_deps: - - python3-venv input_files: - project: container-image ===================================== projects/bison/config ===================================== @@ -3,9 +3,6 @@ version: 3.8.2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 - deps: - - build_essential - - xz-utils input_files: - URL: https://ftp.gnu.org/gnu/bison/bison-[% c("version") %].tar.xz ===================================== projects/browser/config ===================================== @@ -17,12 +17,16 @@ var: - patch targets: - linux-i686: + linux: var: - mar_osname: linux32 arch_deps: - # Install libc6-i386 to be able to run 32bit mar tools (bug 29812) + # Install libc6-i386 to be able to run 32bit mar tools in linux-i686 + # builds (bug 29812). We don't need it in x86_64 builds, but we + # share the container to reduce space used. - libc6-i386 + linux-i686: + var: + mar_osname: linux32 linux-x86_64: var: mar_osname: linux64 ===================================== projects/clang/build ===================================== @@ -3,16 +3,12 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] -export PATH="/var/tmp/dist/cmake/bin:$PATH" +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] +export PATH="/var/tmp/dist/ninja:/var/tmp/dist/cmake/bin:$PATH" [% IF c("var/linux") %] [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), hardened_gcc => 0 }) %] [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] -[% END -%] -[% IF c("var/android") %] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% END -%] -[% IF c("var/linux") || c("var/android") -%] tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] @@ -25,57 +21,15 @@ mkdir build cd build # LLVM_ENABLE_ZLIB solves the "contains a compressed section, but zlib is not available" on lld # LLVM_INSTALL_UTILS allows this LLVM to be used to compile Rust -cmake ../llvm -G "Unix Makefiles" \ +cmake ../llvm -GNinja \ -DCMAKE_INSTALL_PREFIX=$distdir \ -DCMAKE_BUILD_TYPE=Release \ - [% IF c("var/android") || c("var/macos") -%] - -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;lld" \ + -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64[% IF c("var/rlbox") -%];WebAssembly[% END %]" \ + -DLLVM_ENABLE_PROJECTS="clang;lld" \ -DLLVM_ENABLE_ZLIB=ON \ -DLLVM_INSTALL_UTILS=ON \ -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 () { - 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="$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$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" - make_compilerrt "arm64-v8a" "aarch64-linux-android/lib64" - make_compilerrt "x86" "i686-linux-android/lib" - make_compilerrt "x86_64" "x86_64-linux-android/lib64" - - mv $rtdistdir/lib/linux/libclang_rt.builtins-*-android.a $distdir/lib/clang/[% c("var/llvm_version") %]/lib/linux/ -[% END -%] +ninja -j[% c("num_procs") %] -v install cd /var/tmp/dist [% c('tar', { ===================================== projects/clang/config ===================================== @@ -11,14 +11,16 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - enable: '[% c("var/linux") || c("var/android") %]' + enable: '[% c("var/linux") %]' - name: binutils project: binutils - enable: '[% c("var/linux") || c("var/android") %]' + enable: '[% c("var/linux") %]' - project: cmake name: cmake - project: llvm-project name: clang-source + - project: ninja + name: ninja - project: python name: python enable: '[% c("var/linux") %]' ===================================== projects/compiler-rt/build ===================================== @@ -0,0 +1,51 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist/[% project %] +mkdir -p /var/tmp/dist +tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] +export PATH="/var/tmp/dist/ninja:/var/tmp/dist/cmake/bin:$PATH" + +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + +tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] +export PATH="/var/tmp/dist/binutils/bin:$PATH" + +mkdir -p /var/tmp/build +cd /var/tmp/build +tar -xf $rootdir/[% c('input_files_by_name/clang-source') %] +cd clang-source +export LLVM_HOME=$(pwd) +mkdir build +cd build + +installdir=/var/tmp/build/install +mkdir -p $installdir + +cmake ../compiler-rt/ -GNinja \ + -DCMAKE_INSTALL_PREFIX=$installdir \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SYSTEM_NAME=Android \ + -DCMAKE_ANDROID_ARCH_ABI="[% c('var/abi') %]" \ + -DCMAKE_ANDROID_NDK="$ANDROID_NDK_HOME" \ + -DCMAKE_C_FLAGS="-fuse-ld=lld --rtlib=compiler-rt $defines" \ + -DCMAKE_CXX_FLAGS="-fuse-ld=lld --rtlib=compiler-rt $defines" \ + -DCMAKE_EXE_LINKER_FLAGS="-L$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/[% c('var/libdir') %]" \ + -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 + +ninja -j[% c("num_procs") %] -v install + +mkdir -p $distdir/lib/clang/[% c("var/llvm_version") %]/lib/linux/ +mv $installdir/lib/linux/libclang_rt.builtins-*-android.a $distdir/lib/clang/[% c("var/llvm_version") %]/lib/linux/ + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] ===================================== projects/compiler-rt/config ===================================== @@ -0,0 +1,38 @@ +# vim: filetype=yaml sw=2 +version: '[% c("var/llvm_version") %]' +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 + +var: + llvm_version: '[% pc("llvm-project", "version") %]' + +targets: + android-armv7: + var: + libdir: 'arm-linux-androideabi/lib' + android-aarch64: + var: + libdir: 'aarch64-linux-android/lib64' + android-x86: + var: + libdir: 'i686-linux-android/lib' + android-x86_64: + var: + libdir: 'x86_64-linux-android/lib64' + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + - name: binutils + project: binutils + - project: cmake + name: cmake + - project: llvm-project + name: clang-source + - project: ninja + name: ninja + - project: python + name: python + enable: '[% c("var/linux") %]' ===================================== projects/container-image/config ===================================== @@ -37,9 +37,14 @@ pre: | [% IF c("var/linux-cross") -%] dpkg --add-architecture [% c("var/arch_debian") %] [% END -%] + [% IF c("var/container/suite") == "jessie" -%] + # We need to use faketime to run `apt-get update` on jessie, because of + # expired key. See tor-browser-build#40693 + dpkg -i ./libfaketime_0.9.6-3_amd64.deb ./faketime_0.9.6-3_amd64.deb + [% END -%] # Update the package cache again because `pre_pkginst` may change the # package manager configuration. - apt-get update -y -q + [% IF c("var/container/suite") == "jessie" %]faketime '2018-12-24 08:15:42' [% END %]apt-get update -y -q [% END -%] apt-get upgrade -y -q [% @@ -66,6 +71,7 @@ pre: | [% IF pc(c('origin_project'), 'var/post_pkginst', { step => c('origin_step') }) -%] [% pc(c('origin_project'), 'var/post_pkginst', { step => c('origin_step') }) %] [% END -%] + apt-get clean remote_get: | #!/bin/sh @@ -81,3 +87,9 @@ input_files: - project: mmdebstrap-image target: - '[% c("var/container/suite") %]-[% c("var/container/arch") %]' + - URL: http://deb.debian.org/debian/pool/main/f/faketime/faketime_0.9.6-3_amd64.deb + sha256sum: 19b2a01a2fae7e6d5a8b741fc0bc626451cb4c2cc884ee79f1136dd3c2c26213 + enable: '[% c("var/container/suite") == "jessie" %]' + - URL: http://deb.debian.org/debian/pool/main/f/faketime/libfaketime_0.9.6-3_amd64… + sha256sum: 82747d5815b226cfed7f6f9a751bf8c20d457f3ba786add6017d6904dea4fdb4 + enable: '[% c("var/container/suite") == "jessie" %]' ===================================== projects/fenix/config ===================================== @@ -20,8 +20,6 @@ var: gradle_dependencies_version: 37 gradle_version: 7.0.2 glean_parser: 5.0.1 - arch_deps: - - python3-venv targets: release: ===================================== projects/geckoview/build ===================================== @@ -21,6 +21,8 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/nasm') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/node') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config" +tar -C /var/tmp/dist -xf [% c('input_files_by_name/compiler-rt') %] +cp -r /var/tmp/dist/compiler-rt/* /var/tmp/dist/clang/ tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/node/bin:/var/tmp/dist/clang/bin:/var/tmp/dist/binutils/bin:$PATH" ===================================== projects/geckoview/config ===================================== @@ -171,6 +171,8 @@ input_files: name: nasm - project: clang name: clang + - project: 'compiler-rt' + name: 'compiler-rt' - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' ===================================== projects/gradle/config ===================================== @@ -5,8 +5,6 @@ container: use_container: 1 var: - deps: - - unzip gradle_sha256sum: 5.1.1: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798 5.6.4: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d ===================================== projects/libevent/config ===================================== @@ -12,10 +12,6 @@ var: configure_opt_project: --disable-static targets: - macos: - var: - arch_deps: - - faketime windows: var: configure_opt_project: --disable-shared ===================================== projects/mmdebstrap-image/apt-key-allow-expired-key.patch ===================================== @@ -0,0 +1,23 @@ +--- o/apt-key 2022-11-30 14:57:12.742026261 +0000 ++++ n/apt-key 2022-12-01 08:38:08.170140893 +0000 +@@ -815,11 +815,18 @@ + create_gpg_home + fi + setup_merged_keyring ++ tmpfile=$(mktemp) ++ set +e + if [ -n "$FORCED_KEYRING" ]; then +- "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "$(dearmor_filename "${FORCED_KEYRING}")" --ignore-time-conflict "$@" ++ (eval "exec ${GPGSTATUSFD}>$tmpfile"; "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "$(dearmor_filename "${FORCED_KEYRING}")" --ignore-time-conflict "$@") + else +- "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "${GPGHOMEDIR}/pubring.gpg" --ignore-time-conflict "$@" ++ (eval "exec ${GPGSTATUSFD}>$tmpfile"; "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "${GPGHOMEDIR}/pubring.gpg" --ignore-time-conflict "$@") + fi ++ err=$? ++ set -e ++ cat "$tmpfile" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' >&${GPGSTATUSFD} ++ rm -f "$tmpfile" ++ exit $err + ;; + help) + usage ===================================== projects/mmdebstrap-image/config ===================================== @@ -6,7 +6,7 @@ container: use_container: 1 var: - ubuntu_version: 22.04 + ubuntu_version: 22.04.1 pre: | #!/bin/sh @@ -16,6 +16,14 @@ pre: | apt-get update -y -q apt-get install -y -q debian-archive-keyring ubuntu-keyring mmdebstrap gnupg + [% IF c("var/container/suite") == "jessie" -%] + apt-get install -y -q patch + cd /usr/bin + # The gpg key for jessie is expired. We patch apt-key to accept expired keys. + patch -p1 < $rootdir/apt-key-allow-expired-key.patch + cd $rootdir + [% END -%] + export SOURCE_DATE_EPOCH='[% c("timestamp") %]' tar -xf [% c('input_files_by_name/mmdebstrap') %] ./mmdebstrap/mmdebstrap --mode=unshare [% c("var/container/mmdebstrap_opt") %] [% c("var/container/suite") %] output.tar.gz [% c("var/container/debian_mirror") %] @@ -55,4 +63,6 @@ input_files: name: mmdebstrap - URL: 'https://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' - sha256sum: df6fe77cee11bd216ac532f0ee082bdc4da3c0cc1f1d9cb20f3f743196bc4b07 + sha256sum: e1f9200c99da008a473c9ae7b51e13f5ea05dc4c2e12beb43f0f9cbbbf6216f4 + - filename: apt-key-allow-expired-key.patch + enable: '[% c("var/container/suite") == "jessie" %]' ===================================== projects/rust/config ===================================== @@ -7,23 +7,10 @@ container: targets: android: var: - arch_deps: - - libssl-dev - - pkg-config - - zlib1g-dev configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,armv7-linux-androideabi,thumbv7neon-linux-androideabi,aarch64-linux-android,i686-linux-android,x86_64-linux-android --set=target.armv7-linux-androideabi.cc=armv7a-linux-androideabi16-clang --set=target.armv7-linux-androideabi.ar=armv7a-linux-androideabi-ar --set=target.thumbv7neon-linux-androideabi.cc=armv7a-linux-androideabi16-clang --set=target.thumbv7neon-linux-androideabi.ar=armv7a-linux-androideabi-ar --set=target.aarch64-linux-android.cc=aarch64-linux-android21-clang --set=target.aarch64-linux-android.ar=aarch64-linux-android-ar --set=target.i686-linux-android.cc=i686-linux-android16-clang --set=target.i686-linux-android.ar=i686-linux-android-ar --set=target.x86_64-linux-android.cc=x86_64-linux-android21-clang --set=target.x86_64-linux-android.ar=x86_64-linux-android-ar linux: var: - deps: - - libc6-dev-i386 - - lib32stdc++6 - - build-essential - - python - - automake - - libssl-dev - - pkg-config - - hardening-wrapper # We use # `--enable-local-rust` to avoid downloading the required compiler during # build time @@ -58,21 +45,17 @@ targets: macos: var: + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/macosx-toolchain/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,[% c("var/build_target") %] --set=target.[% c("var/build_target") %].cc=[% c("var/build_target") %]-clang --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib arch_deps: - - libssl-dev - pkg-config - - zlib1g-dev - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/macosx-toolchain/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,[% c("var/build_target") %] --set=target.[% c("var/build_target") %].cc=[% c("var/build_target") %]-clang --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib windows: var: - arch_deps: - - libssl-dev - - pkg-config - - zlib1g-dev # See tor-browser-build#29320 compiler: mingw-w64 configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/clang --target=x86_64-unknown-linux-gnu,[% c("arch") %]-pc-windows-gnu --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib + arch_deps: + - pkg-config input_files: - project: container-image ===================================== projects/tor-android-service/config ===================================== @@ -8,9 +8,6 @@ container: use_container: 1 var: - deps: - - build-essential - - unzip # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 5 gradle_version: 5.6.4 ===================================== projects/tor-onion-proxy-library/config ===================================== @@ -8,10 +8,6 @@ container: use_container: 1 var: - deps: - - build-essential - - unzip - - zip # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 5 gradle_version: 5.6.4 ===================================== projects/tor/config ===================================== @@ -9,13 +9,6 @@ tag_gpg_id: 1 container: use_container: 1 -var: - deps: - - build-essential - - automake - - zip - - unzip - targets: nightly: version: '[% c("abbrev") %]' @@ -27,25 +20,15 @@ targets: libdir: lib32 sort_deps: 0 arch_deps: - - libtool - zlib1g-dev:i386 - - hardening-wrapper linux-x86_64: var: libdir: lib64 arch_deps: - - libtool - zlib1g-dev - - hardening-wrapper - macos: - var: - arch_deps: - - faketime android: var: configure_opt_project: '--enable-android --enable-static-openssl --enable-static-libevent --enable-zstd --disable-tool-name-check --disable-system-torrc --disable-system-torrc' - arch_deps: - - libtinfo5 input_files: - project: container-image ===================================== projects/wasi-sysroot/config ===================================== @@ -8,12 +8,6 @@ git_submodule: 1 container: use_container: 1 -targets: - linux: - var: - arch_deps: - - patch - input_files: - project: container-image - name: binutils ===================================== rbm.conf ===================================== @@ -337,11 +337,15 @@ targets: - bison - python3 - python3-distutils + - python3-venv - automake - libtool - zip - unzip - libtinfo5 + - libssl-dev + - pkg-config + - zlib1g-dev configure_opt: '--host=[% c("var/cross_prefix") %] CC=[% c("var/CC") %] [% c("var/configure_opt_project") %]' pre_pkginst: | @@ -434,6 +438,8 @@ targets: deps: - libc6-dev-i386 - lib32stdc++6 + - pkg-config + - libssl-dev - build-essential - python - bison @@ -442,6 +448,8 @@ targets: - libtool - zip - unzip + - xz-utils + - patch linux-asan: var: asan: 1 @@ -500,6 +508,8 @@ targets: - libtool - zip - unzip + - libssl-dev + - zlib1g-dev torbrowser-macos: - macos-universal @@ -554,6 +564,7 @@ targets: rlbox: 0 deps: - build-essential + - faketime - python3 - python3-distutils - automake @@ -561,6 +572,8 @@ targets: - libtool - zip - unzip + - libssl-dev + - zlib1g-dev faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 # The no_build_id target can be useful if you want to quickly display View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Update release prep templates
by Richard Pospesel (＠richard) 08 Dec '22

08 Dec '22

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 9486bc9c by Richard Pospesel at 2022-12-08T16:47:31+00:00 Update release prep templates - - - - - 2 changed files: - .gitlab/issue_templates/Release Prep - Alpha.md - .gitlab/issue_templates/Release Prep - Stable.md Changes: ===================================== .gitlab/issue_templates/Release Prep - Alpha.md ===================================== @@ -28,20 +28,6 @@ - `$(TOR_BROWSER_BRANCH_PREV)` : the full name of the previous tor-browser branch (when rebasing) </details> -<details> - <summary>Desktop</summary> - -### **torbutton** : https://gitlab.torproject.org/tpo/applications/torbutton.git -- [ ] Update translations : - - [ ] `./import-translations.sh` - - **NOTE** : if there are no new strings imported then we are done here - - [ ] Commit with message `Translation updates` - - **NOTE** : only add files which are already being tracked - - [ ] ***(Optional)*** Backport to maintenance branch if present and necessary -- [ ] fixup! `tor-browser`'s `Bug 10760 : Integrate TorButton to TorBrowser core` issue to point to updated `torbutton` commit - -</details> - <details> <summary>Android</summary> @@ -83,6 +69,11 @@ <summary>Shared</summary> ### tor-browser: https://gitlab.torproject.org/tpo/applications/tor-browser.git +- [ ] ***(Optional)*** Update torbutton translations in `toolkit/torbutton` + - [ ] `./import-translations.sh` + - **NOTE** : if there are no new strings imported then we are done here + - [ ] Commit as `fixup!` to the `Add TorStrings module for localization` commit + - **NOTE** : only add files which are already being tracked - [ ] ***(Optional)*** Backport any Android-specific security fixes from Firefox rapid-release - [ ] ***(Optional, Chemspill)*** Backport security-fixes to both `tor-browser` and `base-browser` branches - [ ] ***(Optional)*** Rebase to `$(ESR_VERSION)` @@ -108,7 +99,7 @@ - [ ] `$(DIFF_TOOL) current_patchset.dif rebased_patchset.deff` - [ ] Open MR for the rebase - [ ] Sign/Tag `base-browser` commit: - - **NOTE** : Currently we are using the `Bug 40926: Implemented the New Identity feature` commit as the dividing line between `base-browser` and `tor-browser` + - **NOTE** : Currently we are using the `Bug 40926: Implemented the New Identity feature` commit as the final commit of `base-browser` before `tor-browser` - Tag : `base-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-build1` - Message: `Tagging build1 for $(ESR_VERSION)esr-based alpha` - [ ] Sign/Tag `tor-browser` commit : @@ -120,7 +111,7 @@ </details> <details> - <summary>Build/Signing/Publishing</summary> + <summary>Build</summary> ### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)` (and possibly more specific) branches @@ -195,8 +186,11 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] Provide links to unsigned builds on `$(BUILD_SERVER)` - [ ] Call out any new functionality which needs testing - [ ] Link to any known issues -- [ ] Email Tails dev mailing list: tails-dev(a)boum.org - - [ ] Provide links to unsigned builds on `$(BUILD_SERVER)` + +</details> + +<details> + <summary>Signing/Publishing</summary> ### signing + publishing - [ ] Ensure builders have matching builds @@ -218,7 +212,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - `cd tor-browser-build/tools/signing/` - `./macos-signer-proxy` - [ ] On `$(STAGING_SERVER)` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050 -- [ ] apk signing : *TODO* +- [ ] apk signing : copy signed `*multi.apk` files to the unsigned build outputs directory - [ ] run do-all-signing script: - `cd tor-browser-build/tools/signing/` - `./do-all-signing.sh` @@ -236,7 +230,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - Select `Tor Browser (Alpha)` app - Navigate to `Release > Production` and click `Create new release` button - [ ] Upload the `*.multi.apk` APKs - - If necessary, update the 'Release Name' (should be automatically populated) + - [ ] Update Release Name to Tor Browser version number - [ ] Update Release Notes - Next to 'Release notes', click `Copy from a previous release` - [ ] Edit blog post url to point to most recent blog post @@ -248,7 +242,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in ### website: https://gitlab.torproject.org/tpo/web/tpo.git - [ ] `databags/versions.ini` : Update the downloads versions - `torbrowser-stable/version` : sort of a catch-all for latest stable version - - `torbrowser-stable/win32` : tor version in the expert bundle + - `torbrowser-alpha/version` : sort of a catch-all for latest stable version - `torbrowser-*-stable/version` : platform-specific stable versions - `torbrowser-*-alpha/version` : platform-specific alpha versions - `tor-stable`,`tor-alpha` : set by tor devs, do not touch ===================================== .gitlab/issue_templates/Release Prep - Stable.md ===================================== @@ -3,18 +3,13 @@ - `$(BUILD_SERVER)` : the server the main builder is using to build a tor-browser release - `$(STAGING_SERVER)` : the server the signer is using to to run the signing process -- `$(TOR_LAUNCHER_VERSION)` : version of `tor-launcher`, used in tags - - example : `0.2.33` - `$(ESR_VERSION)` : the Mozilla defined ESR version, used in various places for building tor-browser tags, labels, etc - example : `91.6.0` +- `$(RR_VERSION)` : the Mozilla defined Rapid-Release version; Tor Browser for Android is based off of the `$(ESR_VERSION)`, but Mozilla's Firefox for Android is based off of the `$(RR_VERSION)` so we need to keep track of security vulnerabilities to backport from the monthly Rapid-Release train and our frozen ESR train. + - example: `103` - `$(ESR_TAG)` : the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)` - exmaple : `FIREFOX_91_7_0esr_BUILD2` - `$(ESR_TAG_PREV)` : the Mozilla defined hg (Mercurial) tag associated with the previous ESR version when rebasing (ie, the ESR version we are rebasing from) -- `$(RR_VERSION)` : the Mozilla defined 'Rapid Relese' version, used in various places for building geckoview tags, labels, etc - - example : `96.0.3` -- `$(RR_TAG)` : the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)` - - exmaple : `FIREFOX_96_0_3_RELEASE` -- `$(RR_TAG_PREV)` : the Mozilla defined hg (Mercurial) tag associated with the previous ESR version when rebasing (ie, the ESR version we are rebasing from) - `$(TOR_BROWSER_MAJOR)` : the Tor Browser major version - example : `11` - `$(TOR_BROWSER_MINOR)` : the Tor Browser minor version @@ -31,46 +26,78 @@ - `$(TOR_BROWSER_BRANCH)` : the full name of tor-browser branch - typically of the form: `tor-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1` - `$(TOR_BROWSER_BRANCH_PREV)` : the full name of the previous tor-browser branch (when rebasing) -- `$(GECKOVIEW_BRANCH)` : the full name of geckoview branch - - typically of the form: `tor-browser-$(RR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1` -- `$(GECKOVIEW_BRANCH_PREV)` : the full name of the previous geckoview branch (when rebasing) </details> <details> <summary>Desktop</summary> -### **torbutton** ***(Optional)***: https://gitlab.torproject.org/tpo/applications/torbutton.git -- [ ] ***(Optional)*** Update translations : - - **NOTE** We only update strings in stable if a backported feature depends on new strings +### **torbutton** : https://gitlab.torproject.org/tpo/applications/torbutton.git +- [ ] Update translations : - [ ] `./import-translations.sh` - **NOTE** : if there are no new strings imported then we are done here - [ ] Commit with message `Translation updates` - **NOTE** : only add files which are already being tracked - [ ] fixup! `tor-browser`'s `Bug 10760 : Integrate TorButton to TorBrowser core` issue to point to updated `torbutton` commit -### **tor-launcher** ***(Optional)***: https://gitlab.torproject.org/tpo/applications/tor-launcher.git -- [ ] ***(Optional)*** Update translations: - - **NOTE** We only update strings in stable if a backported feature depends on new strings - - [ ] ./localization/import-translations.sh - - [ ] Commit with message `Translation updates` -- [ ] Update `install.rdf` file with new version -- [ ] Sign/Tag commit : - - Tag : `$(TOR_LAUNCHER_VERSION)` - - Message `Tagging $(TOR_LAUNCHER_VERSION)` -- [ ] Push `main` and tag to origin +</details> + +<details> + <summary>Android</summary> + +### ***Security Vulnerabilities Backport*** : https://www.mozilla.org/en-US/security/advisories/ +- **NOTE** : this work may have already occurred in the analogous stable release prep issue +- [ ] Create tor-browser issue `Backport Android-specific Firefox $(RR_VERSION) to ESR $(ESR_VERSION)-based Tor Browser` + - [ ] Link new backport issue to this release prep issue +- [ ] Go through any `Security Vulnerabilities fixed in Firefox $(RR_VERSION)` (or similar) and create list of CVEs which affect Android that need to be a backported + - Potentially Affected Components: + - `firefox` + - `application-services` + - `android-components` + - `fenix` + +### **application-services** ***(Optional)*** : *TODO: we need to setup a gitlab copy of this repo that we can apply security backports to* +- [ ] Backport any Android-specific security fixes from Firefox rapid-release +- [ ] Sign/Tag commit: + - Tag : `application-services-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` + - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha` +- [ ] Push tag to `origin` + +### **android-components** ***(Optional)*** : https://gitlab.torproject.org/tpo/applications/android-components.git +- [ ] Backport any Android-specific security fixes from Firefox rapid-release +- [ ] Sign/Tag commit: + - Tag : `android-components-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` + - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha)` +- [ ] Push tag to `origin` + +### **fenix** ***(Optional)*** : https://gitlab.torproject.org/tpo/applications/fenix.git +- [ ] Backport any Android-specific security fixes from Firefox rapid-release +- [ ] Sign/Tag commit: + - Tag : `tor-browser-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` + - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha)` +- [ ] Push tag to `origin` + +</details> + +<details> + <summary>Shared</summary> ### tor-browser: https://gitlab.torproject.org/tpo/applications/tor-browser.git +- [ ] ***(Optional)*** Backport any Android-specific security fixes from Firefox rapid-release +- [ ] ***(Optional, Chemspill)*** Backport security-fixes to both `tor-browser` and `base-browser` branches - [ ] ***(Optional)*** Rebase to `$(ESR_VERSION)` - - [ ] Find the Firefox hg tag here : https://hg.mozilla.org/releases/mozilla-esr91/tags + - [ ] Find the Firefox hg tag here : https://hg.mozilla.org/releases/mozilla-esr102/tags - [ ] `$(ESR_TAG)` : `<INSERT_TAG_HERE>` - [ ] Identify the hg patch associated with above hg tag, and find the equivalent `gecko-dev` git commit (search by commit message) - [ ] `gecko-dev` commit : `<INSERT_COMMIT_HASH_HERE>` - - [ ] Create new `tor-browser` branch with the discovered `gecko-dev` commit as `HEAD` named `tor-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1` - [ ] Sign/Tag commit : - Tag : `$(ESR_TAG)` - Message : `Hg tag $(ESR_TAG)` - - [ ] Push new branch and tag to origin - - [ ] Rebase `tor-browser` patches + - [ ] Create new branches with the discovered `gecko-dev` commit as `HEAD` named: + - [ ] `base-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1` + - [ ] `tor-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1` + - [ ] Push new branches and esr tag to origin + - [ ] Rebase `base-browser` patches onto the `gecko-dev` commit + - [ ] Rebase `tor-browser` patches onto the `base-browser` branch - [ ] Compare patch-sets (ensure nothing *weird* happened during rebase): - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..$(TOR_BROWSER_BRANCH)` - [ ] diff of diffs: @@ -79,150 +106,65 @@ - [ ] `git diff $(ESR_TAG)..$(TOR_BROWSER_BRANCH) > rebased_patchset.diff` - [ ] `$(DIFF_TOOL) current_patchset.dif rebased_patchset.deff` - [ ] Open MR for the rebase -- [ ] ***(Optional)*** Backport any required Alpha patches to Stable - - [ ] cherry-pick patches on top of rebased branch (issues to backport should have `Backport` label and be linked to the associated `Release Prep` issue) - - [ ] Close associated `Backport` issues - - [ ] Open MR for the backport commits +- [ ] Sign/Tag `base-browser` commit: + - **NOTE** : Currently we are using the `Bug 40926: Implemented the New Identity feature` commit as the final commit of `base-browser` before `tor-browser` + - Tag : `base-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-build1` + - Message: `Tagging build1 for $(ESR_VERSION)esr-based alpha` - [ ] Sign/Tag `tor-browser` commit : - Tag : `tor-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(FIREFOX_BUILD_N)` - - Message : `Tagging $(FIREFOX_BUILD_N) for $(ESR_VERSION)esr-based (alpha|stable)` -- [ ] Push tag to `origin` + - Message : `Tagging $(FIREFOX_BUILD_N) for $(ESR_VERSION)esr-based alpha` +- [ ] Push rebased branches and tags to `origin` +- [ ] Update Gitlab Default Branch to new Alpha branch: https://gitlab.torproject.org/tpo/applications/tor-browser/-/settings/repos… </details> <details> - <summary>Android</summary> - -### **geckoview**: https://gitlab.torproject.org/tpo/applications/tor-browser.git -- [ ] ***(Optional)*** Rebase to `$(RR_VERSION)` - - [ ] Find the Firefox hg tag here : https://hg.mozilla.org/releases/mozilla-release/tags - - [ ] `$(RR_TAG)` : `<INSERT_TAG_HERE>` - - [ ] Identify the hg patch associated with above hg tag, and find the equivalent `gecko-dev` git commit (search by commit message) - - [ ] `gecko-dev` commit : `<INSERT_COMMIT_HASH_HERE>` - - [ ] Create new `geckoview` branch with the discovered `gecko-dev` commit as `HEAD` named `geckoview-$(RR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1` - - [ ] Sign/Tag commit : - - Tag : `$(RR_TAG)` - - Message : `Hg tag $(RR_TAG)` - - [ ] Push new branch and tag to origin - - [ ] Rebase `geckoview` patches - - [ ] Compare patch-sets (ensure nothing *weird* happened during rebase): - - [ ] rangediff: `git range-diff $(RR_TAG_PREV)..$(GECKOVIEW_BRANCH_PREV) $(RR_TAG)..$(GECKOVIEW_BRANCH)` - - [ ] diff of diffs: - - Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred `$(DIFF_TOOL)` and look at differences on lines that starts with + or - - - [ ] `git diff $(RR_TAG_PREV)..$(GECKOVIEW_BRANCH_PREV) > current_patchset.diff` - - [ ] `git diff $(RR_TAG)..$(GECKOVIEW_BRANCH) > rebased_patchset.diff` - - [ ] `$(DIFF_TOOL) current_patchset.dif rebased_patchset.deff` - - [ ] Open MR for the rebase -- [ ] ***(Optional)*** Backport any required patches to Stable - - [ ] cherry-pick patches on top of rebased branch (issues to backport should have `Backport` label and be linked to the associated `Release Prep` issue) - - [ ] Close associated `Backport` issues - - [ ] Open MR for the backport commits - - [ ] Merge + Push -- [ ] Sign/Tag `geckoview` commit : - - Tag : `geckoview-$(RR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(FIREFOX_BUILD_N)` - - Message : `Tagging $(FIREFOX_BUILD_N) for $(RR_VERSION)-based (alpha|stable)` -- [ ] Push tag to `origin` - -### **tba-translation** ***(Optional)***: https://gitlab.torproject.org/tpo/translation.git -- **NOTE** We only update strings in stable if a backported feature depends on new strings -- [ ] Fetch latest and identify new `HEAD` of `fenix-torbrowserstringsxml` branch - - [ ] `origin/fenix-torbrowserstringsxml` : `<INSERT COMMIT HASH HERE>` - -### **tor-android-service** ***(Optional)***: https://gitlab.torproject.org/tpo/applications/tor-android-service.git -- [ ] Fetch latest and identify new `HEAD` of `main` branch - - [ ] `origin/main` : `<INSERT COMMIT HASH HERE>` - -### **application-services** : *TODO: we need to setup a gitlab copy of this repo that we can apply security backports to* -- [ ] ***(Optional)*** Backport any Android-specific security fixes from Firefox rapid-release -- [ ] Sign/Tag commit: - - Tag : `application-services-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based (alpha|stable)` -- [ ] Push tag to `origin` -### **android-components** ***(Optional)***: https://gitlab.torproject.org/tpo/applications/android-components.git -- [ ] ***(Optional)*** Rebase to `$(RR_VERSION)` - - [ ] Identify the `mozilla-mobile` git tag to start from by first updating `fenix` and then checking which `android-components` tag is used in `buildSrc/src/main/java/AndroidComponents.kt` - - Alternatively search for commit message like `Update Android-Components` - - [ ] Create new branch from tag named `android-components-$(RR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1` - - [ ] Push new branch to origin - - [ ] Rebase `android-components` patches - - [ ] Perform rangediff to ensure nothing weird happened resolving conflicts - - [ ] Open MR for the rebase - - [ ] Merge + Push -- [ ] ***(Optional)*** Backport any required patches to Stable - - [ ] cherry-pick patches on top of rebased branch (issues to backport should have `Backport` label and be linked to the associated `Release Prep` issue) - - [ ] Close associated `Backport` issues - - [ ] Open MR for the backport commits - - [ ] Merge + Push - [ ] Sign/Tag commit: - - Tag : `android-components-$(RR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - - Message: `Tagging $(BUILD_N) for $(RR_VERSION)-based (alpha|stable)` - - [ ] Push tag to origin - -### **fenix** ***(Optional)***: https://gitlab.torproject.org/tpo/applications/fenix.git -- [ ] ***(Optional)*** Rebase to `$(RR_VERSION)` - - Upstream git repo : https://github.com/mozilla-mobile/fenix.git - - [ ] Identify the `mozilla-mobile` git tag to start from - - Seem to be in the form `v$(RR_VERSION)` (for example, `v96.3.0`) - - [ ] Create new branch from tag named `tor-browser-$(RR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1` - - **NOTE** : it is weird but we do use `tor-browser` here rather than `fenix` - - [ ] Push new branch to origin - - [ ] Rebase `fenix` patches - - [ ] Perform rangediff to ensure nothing weird happened resolving conflicts - - [ ] Open MR for the rebase - - [ ] Merge + Push -- [ ] ***(Optional)*** Backport any required patches to Stable - - [ ] cherry-pick patches on top of rebased branch (issues to backport should have `Backport` label and be linked to the associated `Release Prep` issue) - - [ ] Close associated `Backport` issues - - [ ] Open MR for the backport commits - - [ ] Merge + Push -- [ ] Sign/Tag commit: - - Tag : `tor-browser-$(RR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - - Message: `Tagging $(BUILD_N) for $(RR_VERSION)-based (alpha|stable)` -- [ ] Push tag to origin - -</details> - -<details> - <summary>Build/Signing/Publishing</summary> + <summary>Build</summary> ### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git -Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in the various `$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-maint` (and possibly more specific) branches +Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)` (and possibly more specific) branches - [ ] Update `rbm.conf` - [ ] `var/torbrowser_version` : update to next version - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)` - [ ] ***(Desktop Only)*** `var/torbrowser_incremental_from` : update to previous Desktop version - [ ] **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make incrementals-*` step will fail -- [ ] ***(Desktop Only)*** Update `projects/firefox/config` +- [ ] Update `projects/firefox/config` - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased -- [ ] ***(Android Only)*** Update `projects/geckoview/config` - - [ ] `git_hash` : update the `$(BUILD_N)` section to match `geckoview` tag - - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(RR_VERSION)` if rebased -- [ ] ***(Android Only, Optional)*** Update `projects/tba-translations/config`: +- [ ] Update `projects/geckoview/config` + - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag + - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(ESR_VERSION)` if rebased +- [ ] Update `projects/translation-base-browser/config` + - [ ] `git_hash` : update with `HEAD` commit of project's `base-browser` branch +- [ ] Update `projects/translation-base-browser-fluent/config` + - [ ] `git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch +- [ ] Update `projects/tba-translations/config`: - [ ] `git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch -- [ ] ***(Android Only, Optional)*** Update `projects/tor-android-service/config` +- [ ] ***(Optional)*** Update `projects/tor-android-service/config` - [ ] `git_hash` : update with `HEAD` commit of project's `main` branch -- [ ] ***(Android Only, Optional)*** Update `projects/application-services/config`: +- [ ] ***(Optional)*** Update `projects/application-services/config`: **NOTE** we don't have any of our own patches for this project - - [ ] `git_hash` : update to appropriate git commit associated with $(RR_VERSION) -- [ ] ***(Android Only, Optional)*** Update `projects/android-components/config` - - [ ] `git_hash` : update the `$(BUILD_N)` section to match `android-components` tag - - [ ] ***(Optional)*** `var/android_components_version` : update to latest `$(RR_VERSION)` if rebased -- [ ] ***(Android Only, Optional)*** Update `projects/fenix/config` + - [ ] `git_hash` : update to appropriate git commit associated with `$(ESR_VERSION)` +- [ ] Update `projects/android-components/config`: + - [ ] `git_hash` : update the `$(BUILD_N)` section to match alpha `android-components` tag +- [ ] Update `projects/fenix/config` - [ ] `git_hash` : update the `$(BUILD_N)` section to match `fenix` tag - - [ ] ***(Optional)*** `var/fenix_version` : update to latest `$(RR_VERSION)` if rebased -- [ ] ***(Android Only)*** Update allowed_addons.json by running (from `tor-browser-build` root): - - `./tools/fetch_allowed_addons.py > projects/tor-browser/allowed_addons.json` + - [ ] ***(Optional)*** `var/fenix_version` : update to latest `$(ESR_VERSION)` if rebased +- [ ] Update allowed_addons.json by running (from `tor-browser-build` root): + - `./tools/fetch_allowed_addons.py > projects/browser/allowed_addons.json` - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript - - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/tor-browser/config` + - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/browser/config` - [ ] `URL` - [ ] `sha256sum` -- [ ] Check for OpenSSL updates here : https://github.com/openssl/openssl/tags - - [ ] ***(Optional)*** If new 1.X.Y series tag available, update `projects/openssl/config` - - [ ] `version` : update to next 1.X.Y release tag +- [ ] Check for OpenSSL updates here : https://www.openssl.org/source/ + - [ ] ***(Optional)*** If new 1.X.Y version available, update `projects/openssl/config` + - [ ] `version` : update to next 1.X.Y version - [ ] `input_files/sha256sum` : update to sha256 sum of source tarball -- [ ] Check for tor updates here : https://gitlab.torproject.org/tpo/core/tor/-/tags ; Tor Browser Alpha uses `-alpha` tagged tor, while stable uses the stable series +- [ ] Check for zlib updates here: https://github.com/madler/zlib/releases + - [ ] **(Optional)** If new tag available, update `projects/zlib/config` + - [ ] `version` : update to next release tag +- [ ] Check for tor updates here : https://gitlab.torproject.org/tpo/core/tor/-/tags ; Tor Browser Alpha uses latest `-alpha` tagged tor (or latest of stable if newer) - [ ] ***(Optional)*** Update `projects/tor/config` - [ ] `version` : update to next release tag - [ ] Check for go updates here : https://golang.org/dl @@ -244,7 +186,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] Ensure ChangeLog.txt is sync'd between alpha and stable branches - [ ] Open MR with above changes - [ ] Begin build on `$(BUILD_SERVER)` (and fix any issues which come up) -- [ ] Sign/Tag commit : `make signtag-(alpha|release)` +- [ ] Sign/Tag commit : `make signtag-release` - [ ] Push tag to origin ### notify stakeholders @@ -255,57 +197,32 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] Email Tails dev mailing list: tails-dev(a)boum.org - [ ] Provide links to unsigned builds on `$(BUILD_SERVER)` -### blog: https://gitlab.torproject.org/tpo/web/blog.git - -- [ ] Duplicate previous Stable or Alpha release blog post as appropriate to new directory under `content/blog/new-release-tor-browser-$(TOR_BROWSER_VERSION)` and update with info on release : - - [ ] Update Tor Browser version numbers - - [ ] Note any ESR rebase - - [ ] Note any Rapid Release rebase - - [ ] Link to any Firefox security updates - - [ ] Note any updates to : - - [ ] tor - - [ ] OpenSSL - - [ ] go - - [ ] NoScript - - [ ] Convert ChangeLog.txt to markdown format used here by : `tor-browser-build/tools/changelog-format-blog-post` -- [ ] Push to origin as new branch, open 'Draft :' MR -- [ ] Remove `Draft:` from MR once signed-packages are uploaded -- [ ] Merge -- [ ] Publish after CI passes +</details> -### website: https://gitlab.torproject.org/tpo/web/tpo.git -- [ ] `databags/versions.ini` : Update the downloads versions - - `torbrowser-stable/version` : sort of a catch-all for latest stable version - - `torbrowser-stable/win32` : tor version in the expert bundle - - `torbrowser-*-stable/version` : platform-specific stable versions - - `torbrowser-*-alpha/version` : platform-specific alpha versions - - `tor-stable`,`tor-alpha` : set by tor devs, do not touch -- [ ] Push to origin as new branch, open 'Draft :' MR -- [ ] Remove `Draft:` from MR once signed-packages are uploaded -- [ ] Merge -- [ ] Publish after CI passes +<details> + <summary>Signing/Publishing</summary> ### signing + publishing - [ ] Ensure builders have matching builds - [ ] On `$(STAGING_SERVER)`, ensure updated: - [ ] `tor-browser-build/tools/signing/set-config` - - [ ] `NSS_DB_DIR` : location of the `nssdb7` directory + - `NSS_DB_DIR` : location of the `nssdb7` directory - [ ] `tor-browser-build/tools/signing/set-config.hosts` - - [ ] `ssh_host_builder` : ssh hostname of machine with unsigned builds + - `ssh_host_builder` : ssh hostname of machine with unsigned builds - **NOTE** : `tor-browser-build` is expected to be in the `$HOME` directory) - - [ ] `ssh_host_linux_signer` : ssh hostname of linux signing machine - - [ ] `ssh_host_macos_signer` : ssh hostname of macOS signing machine + - `ssh_host_linux_signer` : ssh hostname of linux signing machine + - `ssh_host_macos_signer` : ssh hostname of macOS signing machine - [ ] `tor-browser-build/tools/signing/set-config.macos-notarization` - - [ ] `macos_notarization_user` : the email login for a tor notariser Apple Developer account + - `macos_notarization_user` : the email login for a tor notariser Apple Developer account - [ ] `tor-browser-build/tools/signing/set-config.tbb-version` - - [ ] `tbb_version` : tor browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`) - - [ ] `tbb_version_build` : the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`) - - [ ] `tbb_version_type` : either `alpha` for alpha releases or `release` for stable releases + - `tbb_version` : tor browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`) + - `tbb_version_build` : the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`) + - `tbb_version_type` : either `alpha` for alpha releases or `release` for stable releases - [ ] On `$(STAGING_SERVER)` in a separate `screen` session, run the macOS proxy script: - `cd tor-browser-build/tools/signing/` - `./macos-signer-proxy` - [ ] On `$(STAGING_SERVER)` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050 -- [ ] ***(Android Only)*** APK Signing: *TODO* +- [ ] apk signing : copy signed `*multi.apk` files to the unsigned build outputs directory - [ ] run do-all-signing script: - `cd tor-browser-build/tools/signing/` - `./do-all-signing.sh` @@ -317,23 +234,51 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] `/srv/cdn-master.torproject.org/htdocs/aus1/torbrowser` - [ ] `/srv/dist-master.torproject.org/htdocs/torbrowser` - [ ] Static update components : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org` - - [ ] Enable update responses : - - [ ] alpha: `./deploy_update_responses-alpha.sh` - - [ ] release: `./deploy_update_responses-release.sh` -- [ ] ***(Android Only)*** : Publish APKs to Google Play: - - [ ] Log into https://play.google.com/apps/publish - - [ ] Select `Tor Browser` app - - [ ] Navigate to `Release > Production` and click `Create new release` button + - [ ] Enable update responses : `./deploy_update_responses-alpha.sh` +- [ ] Publish APKs to Google Play: + - Log into https://play.google.com/apps/publish + - Select `Tor Browser (Alpha)` app + - Navigate to `Release > Production` and click `Create new release` button - [ ] Upload the `*.multi.apk` APKs - - [ ] If necessary, update the 'Release Name' (should be automatically populated) + - [ ] Update Release Name to Tor Browser version number - [ ] Update Release Notes - - [ ] Next to 'Release notes', click `Copy from a previous release` + - Next to 'Release notes', click `Copy from a previous release` - [ ] Edit blog post url to point to most recent blog post - - [ ] Save, review, and configure rollout percentage + - Save, review, and configure rollout percentage - [ ] 25% rollout when publishing a scheduled update - [ ] 100% rollout when publishing a security-driven release - [ ] Update rollout percentage to 100% after confirmed no major issues +### website: https://gitlab.torproject.org/tpo/web/tpo.git +- [ ] `databags/versions.ini` : Update the downloads versions + - `torbrowser-stable/version` : sort of a catch-all for latest stable version + - `torbrowser-alpha/version` : sort of a catch-all for latest stable version + - `torbrowser-*-stable/version` : platform-specific stable versions + - `torbrowser-*-alpha/version` : platform-specific alpha versions + - `tor-stable`,`tor-alpha` : set by tor devs, do not touch +- [ ] Push to origin as new branch, open 'Draft :' MR +- [ ] Remove `Draft:` from MR once signed-packages are uploaded +- [ ] Merge +- [ ] Publish after CI passes and builds are published + +### blog: https://gitlab.torproject.org/tpo/web/blog.git + +- [ ] Duplicate previous Stable or Alpha release blog post as appropriate to new directory under `content/blog/new-release-tor-browser-$(TOR_BROWSER_VERSION)` and update with info on release : + - [ ] Update Tor Browser version numbers + - [ ] Note any ESR rebase + - [ ] Link to any Firefox security updates from ESR upgrade + - [ ] Link to any Android-specific security backports + - [ ] Note any updates to : + - tor + - OpenSSL + - NoScript + - [ ] Convert ChangeLog.txt to markdown format used here by : + - `tor-browser-build/tools/changelog-format-blog-post` +- [ ] Push to origin as new branch, open `Draft:` MR +- [ ] Remove `Draft:` from MR once signed-packages are uploaded +- [ ] Merge +- [ ] Publish after CI passes and website has been updated + ### tor-announce mailing list - [ ] Send an email to tor-announce(a)lists.torproject.org, using the same content as the blog post and subject "Tor Browser $version is released". View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.5.0esr-12.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by Richard Pospesel (＠richard) 08 Dec '22

08 Dec '22

Richard Pospesel pushed to branch tor-browser-102.5.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: c52fe531 by Henry Wilkes at 2022-12-08T13:52:03+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core - - - - - 1 changed file: - tools/lint/eslint/eslint-plugin-mozilla/lib/environments/browser-window.js Changes: ===================================== tools/lint/eslint/eslint-plugin-mozilla/lib/environments/browser-window.js ===================================== @@ -90,7 +90,7 @@ function getGlobalScriptIncludes(scriptPath) { .replace("chrome://global/content/", "toolkit/content/") .replace( "chrome://torbutton/content/", - "toolkit/torproject/torbutton/chrome/content/" + "toolkit/torbutton/chrome/content/" ); for (let mapping of Object.getOwnPropertyNames(MAPPINGS)) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c52fe53… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c52fe53… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_102_6_0esr_BUILD1
by Richard Pospesel (＠richard) 08 Dec '22

08 Dec '22

Richard Pospesel pushed new tag FIREFOX_102_6_0esr_BUILD1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/FIREFOX_1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch base-browser-102.6.0esr-12.0-1
by Richard Pospesel (＠richard) 08 Dec '22

08 Dec '22

Richard Pospesel pushed new branch base-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Add WebTunnel Integration
by Pier Angelo Vendrame (＠pierov) 07 Dec '22

07 Dec '22

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 0310a2c7 by Shelikhoo at 2022-12-07T14:57:22+00:00 Add WebTunnel Integration This is a squashed commit that includes: Replace cgo Condition in Go Config Include WebTunnel README in Browser Include WebTunnel into Tor Expert Bundle Add WebTunnel to default torrc Add WebTunnel project Their original form is available at: https://gitlab.torproject.org/shelikhoo/tor-browser-build-2/-/commits/dev-w… See also: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_re… - - - - - 9 changed files: - projects/browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix - projects/browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix - projects/browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix - projects/browser/build - projects/go/config - projects/tor-expert-bundle/build - projects/tor-expert-bundle/config - + projects/webtunnel/build - + projects/webtunnel/config Changes: ===================================== projects/browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix ===================================== @@ -3,3 +3,6 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser ## snowflake configuration ClientTransportPlugin snowflake exec ./TorBrowser/Tor/PluggableTransports/snowflake-client + +## webtunnel configuration +ClientTransportPlugin webtunnel exec ./TorBrowser/Tor/PluggableTransports/webtunnel-client ===================================== projects/browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix ===================================== @@ -3,3 +3,6 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec PluggableTra ## snowflake configuration ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client + +## webtunnel configuration +ClientTransportPlugin webtunnel exec PluggableTransports/webtunnel-client ===================================== projects/browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix ===================================== @@ -3,3 +3,6 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\T ## snowflake configuration ClientTransportPlugin snowflake exec TorBrowser\Tor\PluggableTransports\snowflake-client.exe + +## webtunnel configuration +ClientTransportPlugin webtunnel exec TorBrowser\Tor\PluggableTransports\webtunnel-client.exe ===================================== projects/browser/build ===================================== @@ -88,9 +88,13 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b rm -f aarch64/tor/pluggable_transports/bridges_list.*.txt [% END -%] - # Snowflake's README is the only documentation shipped in tor-expert-bundle + # Snowflake's README is a documentation shipped in tor-expert-bundle mkdir -p "$TBDIR/$DOCSPATH/snowflake" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/snowflake"[% END %] mv_tbdir tor/pluggable_transports/README.SNOWFLAKE.md "$DOCSPATH/snowflake/README.md" + + # WebTunnel's README is a documentation shipped in tor-expert-bundle + mkdir -p "$TBDIR/$DOCSPATH/webtunnel" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/webtunnel"[% END %] + mv_tbdir tor/pluggable_transports/README.WEBTUNNEL.md "$DOCSPATH/webtunnel/README.md" # Move the PTs to where TB expects them mkdir -p "$TBDIR/$TORBINPATH" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$TORBINPATH"[% END %] ===================================== projects/go/config ===================================== @@ -26,7 +26,7 @@ var: export CGO_LDFLAGS_ALLOW="-z|noexecstack" export CGO_LDFLAGS="-z noexecstack" [% END -%] - [% IF c("var/linux-i686") -%] + [% IF c("var/cgo") -%] export CGO_ENABLED=1 [% END -%] export GOTMPDIR=/var/tmp/build/go-tmp ===================================== projects/tor-expert-bundle/build ===================================== @@ -11,6 +11,7 @@ mkdir pluggable_transports && cd pluggable_transports tar -xkf $rootdir/[% c('input_files_by_name/obfs4') %] tar -xkf $rootdir/[% c('input_files_by_name/snowflake') %] +tar -xkf $rootdir/[% c('input_files_by_name/webtunnel') %] # copy in bridge lines for each pluggable transport mv $rootdir/bridges_list.obfs4.txt . ===================================== projects/tor-expert-bundle/config ===================================== @@ -13,6 +13,8 @@ input_files: project: obfs4 - name: snowflake project: snowflake + - project: webtunnel + name: webtunnel - filename: bridges_list.obfs4.txt - filename: bridges_list.meek-azure.txt - - filename: bridges_list.snowflake.txt + - filename: bridges_list.snowflake.txt \ No newline at end of file ===================================== projects/webtunnel/build ===================================== @@ -0,0 +1,34 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] +distdir=/var/tmp/dist/[% project %] +mkdir -p $distdir + +[% IF c("var/android") -%] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + # We need to explicitly set CGO_ENABLED with Go 1.13.x as the Android build + # breaks otherwise. + export CGO_ENABLED=1 +[% END -%] + +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] + +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] + +mkdir -p "$GOPATH/src/gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel.git" +ln -sf "$PWD" "$GOPATH/src/gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel" + +cd main/client +go build -ldflags '-s' +cp -a client[% IF c("var/windows") %].exe[% END %] $distdir/webtunnel-client[% IF c("var/windows") %].exe[% END %] + +cd /var/tmp/build/[% project %]-[% c('version') %] +cp -a README.md $distdir/README.WEBTUNNEL.md + +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] ===================================== projects/webtunnel/config ===================================== @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webt… +git_hash: 2ecf64381bad8a5db45c5871dcad7d12831dca69 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 + +input_files: + - project: container-image + - name: go + project: go + - name: goptlib + project: goptlib + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/android") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[builders/tor-browser-build] annotated tag tbb-12.0-build1 created (now 21a64c0c)
by gitolite role 07 Dec '22

07 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to annotated tag tbb-12.0-build1 in repository builders/tor-browser-build. at 21a64c0c (tag) tagging db3c880343b1c1e2b0295776f7d7e63370475985 (commit) replaces tbb-12.0a5-build1 by Richard Pospesel on Wed Dec 7 11:41:04 2022 +0000 - Log ----------------------------------------------------------------- Tagging build1 for 12.0 -----BEGIN PGP SIGNATURE----- iQJLBAABCAA1FiEEvnyRTMkiztnZPSO33kc2A2PzSywFAmOQe9AXHHJpY2hhcmRA dG9ycHJvamVjdC5vcmcACgkQ3kc2A2PzSyyTrg/+MC+JyTIKDzKfgyiRPrVisr0N uFn8GxlvtR5aBhHq70ebCLlBP+/1P0TPz3kG9efwkKDnFptTzoIZJkXHaINO1h5P V/z08okdDutts6QU9/MNKxuVpRUXjoiOLxv1DFQkhgIENW0HJfrtdi6GC6mFlQot adedrhPIew91pzfKmqdMgbofqdXnyXDWCLC9+PR+7oaXAbirDZVyo45NpRsLs1xd 08AtpdIhJ1wNnJoNT07IlFOCll+VRkY72UZBuZJTCtlQRKwUXrlcuwJEfsZPjDR4 DAg+XpDEMmY+WXu/Ku7UGU6BfY7JRxDVEIJGKSwA0NCEcDk33Ry6YSviduvGerQy zqdwSErVPwqdCgE9HuVAmelgWGX7HJtKh4SJYEPxwNBqr27vMPtUl7fHyCDnZpC2 5MGeYzJd17taI0cWyNBKRL1IiXXG4AvO8lsS4dHagjX2860Fm+SEwSr7fHpztuFT 4y6dyOibyz3edSrFZ/CTE4lY3YLP6ffulsbM1NoZVu9/iLWPSX6KYB9b8OxKxXKV OXvHqhmA27ZyISvskJjlzteyer90KqocFKUMSuwUQFCsK1rmzS1RUF3Qk7vcrrq8 GCBF5aMcYtiylHz+stVl7uh4noXa9VSHSUtNuD+RLENOodcWURBN0ef/eF88fSuH i/Dz3tM165b5AFceoFI= =0k4t -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch maint-12.0 updated: Bug 40637: Prepare stable release 12.0
by gitolite role 07 Dec '22

07 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch maint-12.0 in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/maint-12.0 by this push: new db3c8803 Bug 40637: Prepare stable release 12.0 db3c8803 is described below commit db3c880343b1c1e2b0295776f7d7e63370475985 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Mon Dec 5 17:25:32 2022 +0000 Bug 40637: Prepare stable release 12.0 --- projects/browser/Bundle-Data/Docs/ChangeLog.txt | 186 +++++++++++++++++++++++- projects/browser/allowed_addons.json | 108 +++++++------- projects/fenix/config | 4 +- projects/firefox/config | 4 +- projects/geckoview/config | 2 +- projects/manual/config | 4 +- projects/tba-translation/config | 2 +- projects/tor/config | 2 +- projects/translation-base-browser-fluent/config | 2 +- projects/translation-base-browser/config | 2 +- rbm.conf | 4 +- 11 files changed, 251 insertions(+), 69 deletions(-) diff --git a/projects/browser/Bundle-Data/Docs/ChangeLog.txt b/projects/browser/Bundle-Data/Docs/ChangeLog.txt index f7e38129..17582963 100644 --- a/projects/browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,182 @@ +Tor Browser 12.0 - December 5 2022 + * All Platforms + * Update Translations + * Update tor to 0.4.7.12 + * Bug 17228: Consideration for disabling/trimming referrers within TBB [tor-browser] + * Bug 24686: In Tor Browser context, should network.http.tailing.enabled be set to false? [tor-browser] + * Bug 27127: Audit and enable HTTP/2 push [tor-browser] + * Bug 27258: font whitelist means we don't have to set gfx.downloadable_fonts.fallback_delay [tor-browser] + * Bug 40057: ensure that CSS4 system colors are not a fingerprinting vector [tor-browser] + * Bug 40058: ensure no locale leaks from new Intl APIs [tor-browser] + * Bug 40183: Consider disabling TLS ciphersuites containing SHA-1 [tor-browser] + * Bug 40251: Clear obsolete prefs after torbutton!27 [tor-browser] + * Bug 40406: Remove Presentation API related prefs [tor-browser] + * Bug 40491: Don't auto-pick a v2 address when it's in Onion-Location header [tor-browser] + * Bug 40494: Update Startpage and Blockchair onion search providers [tor-browser] + * Bug 40580: Add support for Ukranian (uk) [tor-browser-build] + * Bug 40646: Don't build Español AR anymore [tor-browser-build] + * Bug 40674: Add Secondary Snowflake Bridge [tor-browser-build] + * Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 [tor-browser] + * Bug 41098: Compare Tor Browser's and GeckoView's profiles [tor-browser] + * Bug 41125: Review Mozilla 1732792: retry polling requests without proxy [tor-browser] + * Bug 41154: Review Mozilla 1765167: Deprecate Cu.import [tor-browser] + * Bug 41164: Add some #define for the base-browser section [tor-browser] + * Bug 41306: Typo "will not able" in "Tor unexpectedly exited" dialog [tor-browser] + * Bug 41317: Tor Browser leaks banned ports in network.security.ports.banned [tor-browser] + * Bug 41345: fonts: windows whitelist contains supplemental fonts [tor-browser] + * Bug 41398: Disable Web MIDI API [tor-browser] + * Bug 41406: Do not define `--without-wasm-sandboxed-libraries` if `WASI_SYSROOT` is defined [tor-browser] + * Bug 41420: Remove brand.dtd customization on nightly [tor-browser] + * Bug 41457: Remove more Mozilla permissions [tor-browser] + * Bug 41473: Add support for Albanian (sq) [tor-browser] + * Windows + macOS + Linux + * Update Firefox to 102.5.0esr + * Bug 17400: Decide how to use the multi-lingual Tor Browser in the alpha/release series [tor-browser] + * Bug 40595: Migrate to 102 on desktop [tor-browser-buid] + * Bug 40638: Visit our website link after build-to-build upgrade in Nightly channel points to old v2 onion [tor-browser-build] + * Bug 40648: Do not customize update.locale in multi-lingual builds [tor-browser-build] + * Bug 40853: use Subprocess.jsm to launch tor [tor-browser] + * Bug 40933: Migrate remaining tor-launcher functionality to tor-browser [tor-browser] + * Bug 41011: The Internet and Tor status are visible when opening the settings [tor-browser] + * Bug 41044: Content exceeding the height of the connection settings modals [tor-browser] + * Bug 41116: Review Mozilla 1226042: add support for the new 'system-ui' generic font family [tor-browser] + * Bug 41117: Review Mozilla 1512851: Add Share Menu to File Menu on macOS [tor-browser] + * Bug 41283: Toolbar buttons missing their label attribute [tor-browser] + * Bug 41284: Stray security-level- fluent ids [tor-browser] + * Bug 41287: New identity button inactive if added after customization [tor-browser] + * Bug 41292: moreFromMozilla pane in about:preferences in 12.0a2 [tor-browser] + * Bug 41293: Incomplete branding in German with 12.0a2 [tor-browser] + * Bug 41337: Add a title to the new identity confirmation [tor-browser] + * Bug 41342: Update the New Identity dialog to the proton modal style [tor-browser] + * Bug 41344: Authenticated Onion Services do not prompt for auth key in 12.0 alpha series [tor-browser] + * Bug 41352: Update or drop the show manual logic in torbutton [tor-browser] + * Bug 41369: Consider a different list-order for locales in language menu [tor-browser] + * Bug 41374: Missing a few torconnect strings in the DTD [tor-browser] + * Bug 41377: Hide `Search for more languages...` from Language selector in multi-locale build [tor-browser] + * Bug 41378: Inform users when Tor Browser sets their language automatically [tor-browser] + * Bug 41385: Bootstrap failure is logged but not raised up to about:torconnect [tor-browser] + * Bug 41386: The new tor-launcher has a problem when another Tor is running [tor-browser] + * Bug 41387: New identity and new circuit ended up inside history [tor-browser] + * Bug 41400: Missing onionAuthViewKeys causes "Onion Services Keys" dialog to be empty. [tor-browser] + * Bug 41401: Missing some mozilla icons because we still loading them from "chrome://browser/skin" rather than "chrome://global/skin/icons" [tor-browser] + * Bug 41404: Fix blockchair-onion search extension [tor-browser] + * Bug 41409: Circuit display is broken on Tails [tor-browser] + * Bug 41410: Opening and closing HTTPS-Only settings make the identity panel shrink [tor-browser] + * Bug 41412: New Identity shows "Tor Browser" instead of "Restart Tor Browser" in unstranslated locales [tor-browser] + * Bug 41417: Prompt users to restart after changing language [tor-browser] + * Bug 41429: TorConnect and TorSettings are initialized twice [tor-browser] + * Bug 41435: Add a Tor Browser migration function [tor-browser] + * Bug 41436: The new tor-launcher handles arrays in the wrong way [tor-browser] + * Bug 41437: Use the new media query for dark theme for the "Connected" pill in bridges [tor-browser] + * Bug 41449: Onion authentication's learn more should link to the offline manual [tor-browser] + * Bug 41451: Still using requestedLocales in torbutton [tor-browser] + * Bug 41455: Tor Browser dev build cannot launch tor [tor-browser] + * Bug 41458: Prevent `mach package-multi-locale` from actually creating a package [tor-browser] + * Bug 41462: Add anchors to bridge-moji and onion authentication entries [tor-browser] + * Bug 41466: Port YEC 2022 campaign to Tor Browser 12.0 (Desktop) [tor-browser] + * Bug 41495: Clicking on "View Logs" in the "Establishing Connection" page takes you to about:preferences#connection and not logs [tor-browser] + * Bug 41498: The Help panel is empty in 12.0a4 [tor-browser] + * Bug 41508: Update the onboarding link for 12.0 [tor-browser] + * Windows + * Bug 41149: Review Mozilla 1762576: Firefox is not allowing Symantec DLP to inject DLL into the browser for Data Loss Prevention software [tor-browser] + * Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one [tor-browser] + * Bug 41426: base-browser nightly fails to build for windows-i686 [tor-browser] + * macOS + * Bug 23451: Adapt font whitelist to changes on macOS (zh locales) [tor-browser] + * Bug 41004: The Bangla font does not display correctly on MacOs [tor-browser] + * Bug 41108: Remove privileged macOS installation from 102 [tor-browser] + * Bug 41294: Bookmarks manager broken in 12.0a2 on MacOS [tor-browser] + * Bug 41348: cherry-pick macOS OSSpinLock replacements [tor-browser] + * Bug 41370: Find a way to ship custom default bookmarks without changing language-packs on macOS [tor-browser] + * Bug 41372: "Japanese" language menu item is localised in multi-locale testbuild (on mac OS) [tor-browser] + * Bug 41379: The new tor-launcher is broken also on macOS [tor-browser] + * Linux + * Bug 40359: Tor Browser Launcher has Wrong Icon [tor-browser] + * Bug 40626: Define the replacements for generic families on Linux [tor-browser-build] + * Bug 41163: Fixing loading of bundled fonts on linux [tor-browser] + * Android + * Update GeckoView to 102.5.0esr + * Bug 40014: Check which of our mobile prefs and configuration changes are still valid for GeckoView [tor-browser] + * Bug 40631: Stop bundling HTTPS Everywhere on Android [tor-browser-build] + * Bug 41394: Implement a setting to always prefer onion sites [tor-browser] + * Bug 41465: Port YEC 2022 campaign to Tor Browser 12.0 (Android) [tor-browser] + * Build System + * All Platforms + * Update Go to 1.19.3 + * Bug 23656: Use .mozconfig files in tor-browser repo for rbm builds [tor-browser-build] + * Bug 28754: make testbuild-android-armv7 stalls during sha256sum step [tor-browser-build] + * Bug 40049: gpg_keyring should allow for array of keyrings [rbm] + * Bug 40397: Create a new build target to package tor daemon, pluggable transports and dependencies [tor-browser-build] + * Bug 40407: Bump binutils version to pick up security improvements for Windows users [tor-browser-build] + * Bug 40585: Prune the manual more [tor-browser-build] + * Bug 40587: Migrate tor-browser-build configs from gitolite to gitlab repos [tor-browser-build] + * Bug 40591: Rust 1.60 not working to build 102 on Debian Jessie [tor-browser-build] + * Bug 40592: Consider re-using our LLVM/Clang to build Rust [tor-browser-build] + * Bug 40593: Update signing scripts to take into account new project names and layout [tor-browser-build] + * Bug 40607: Add alpha-specific release prep template [tor-browser-build] + * Bug 40610: src-*.tar.xz tarballs are missing in https://dist.torproject.org/torbrowser/12.0a1/ [tor-browser-build] + * Bug 40612: Migrate Release Prep template to Release Prep - Stable [tor-browser-build] + * Bug 40619: Make sure translations are taken from gitlab.tpo and not git.tpo [tor-browser-build] + * Bug 40627: Add boklm to torbutton.gpg [torbrowser-build] + * Bug 40634: Update the project/browser path in tools/changelog-format-blog-post and other files [tor-browser-build] + * Bug 40636: Remove https-everywhere from projects/browser/config [tor-browser-build] + * Bug 40639: Remove tor-launcher references [tor-browser-build] + * Bug 40643: Update Richard's key in torbutton.gpg [tor-browser-build] + * Bug 40645: Remove unused signing keys and create individual keyrings for Tor Project developers [tor-browser-build] + * Bug 40655: Published tor-expert-bundle tar.gz files should not include their tor-browser-build build id [tor-browser-build] + * Bug 40656: Improve get_last_build_version in tools/signing/nightly/sign-nightly [tor-browser-build] + * Bug 40660: Update changelog-format-blog-post script to point gitlab rather than gitolite [tor-browser-build] + * Bug 40662: Make base-browser nightly build from tag [tor-browser-build] + * Bug 40663: Do not ship bookmarks in tor-browser-build anymore [tor-browser-build] + * Bug 40667: Update Node.js to 12.22.12 [tor-browser-build] + * Bug 40669: Remove HTTPS-Everywhere keyring [tor-browser-build] + * Bug 40671: Update langpacks URL [tor-browser-build] + * Bug 40675: Update tb_builders list in set-config [tor-browser-build] + * Bug 40690: Revert fix for zlib build break [tor-browser-build] + * Bug 41308: Use the same branch for Desktop and GeckoView [tor-browser] + * Bug 41321: Delete various master branches after automated build/testing scripts are updated [tor-browser] + * Bug 41340: Opt in to some of the NIGHTLY_BUILD features [tor-browser] + * Bug 41357: Enable browser toolbox debugging by default for dev builds [tor-browser] + * Bug 41446: Multi-lingual alpha bundles break make fetch [tor-browser] + * Windows + macOS + Linux + * Bug 40499: Update firefox to enable building from new 'base-browser' tag [tor-browser-build] + * Bug 40500: Add base-browser package project [tor-browser-build] + * Bug 40501: Makefile updates to support building base-browser packages [tor-browser-build] + * Bug 40503: Update Release Prep issue template with base-browser and privacy browser changes [tor-browser-build] + * Bug 40547: Remove container/remote_* from rbm.conf [tor-browser-build] + * Bug 40581: Update reference to master branches [tor-browser-build] + * Bug 40641: Fetch Firefox locales from l10n-central [tor-browser-build] + * Bug 40678: Force all 11.5 users to update through 11.5.8 before 12.0 [tor-browser-build] + * Bug 40685: Remove targets/nightly/var/mar_locales from rbm.conf [tor-browser-build] + * Bug 40686: Add a temporary project to fetch Fluent tranlations for base-browser [tor-browser-build] + * Bug 40691: Update firefox config to point to base-browser branch rather than a particular tag in nightly [tor-browser-build] + * Bug 40699: Fix input_files in projects/firefox-l10n/config [tor-browser-build] + * Bug 41099: Update+comment the update channels in update_responses.config.yaml [tor-browser] + * Windows + * Bug 29318: Use Clang for everything on Windows [tor-browser-buid] + * Bug 29321: Use mingw-w64/clang toolchain to build tor [tor-browser-build] + * Bug 29322: Use mingw-w64/clang toolchain to build OpenSSL [tor-browser-build] + * Bug 40409: Upgrade NSIS to 3.08 [tor-browser-build] + * Bug 40666: Fix compiler depedencies for Firefox on Windows [tor-browser-build] + * macOS + * Bug 40067: Rename "OS X" to "macOS" [tor-browser-build] + * Bug 40158: Add support for macOS AArch64 [tor-browser-build] + * Bug 40439: Create universal x86-64/arm64 mac builds [tor-browser-build] + * Bug 40605: Reworked the macOS toolchain creation [tor-browser-build] + * Bug 40620: Update macosx-sdk to 11.0 [tor-browser-build] + * Bug 40687: macOS nightly builds with packaged locales fail [tor-browser-build] + * Bug 40694: aarch64 tor-expert-bundle for macOS is not exported as part of the browser build [tor-browser-build] + * Linux + * Bug 31321: Add cc -> gcc link to projects/gcc [tor-browser-build] + * Bug 40621: Update namecoin patches for linted TorButton [tor-browser-build] + * Bug 40659: Error building goservice for linux in nightly build [tor-browser-build] + * Bug 41343: Add -without-wam-sandboxed-libraries to mozconfig-linux-x86_64-dev for local builds [tor-browser] + * Android + * Bug 40574: Improve tools/signing/android-signing [tor-browser-build] + * Bug 40604: Fix binutils build on android [tor-browser-build] + * Bug 40640: Extract Gradle in the toolchain setup [tor-browser-build] + * Bug 41304: Add Android-specific targets to makefiles [tor-browser] + Tor Browser 12.0a5 - November 30 2022 * All Platforms * Update Translations @@ -89,9 +268,13 @@ Tor Browser 11.5.8 - November 18 2022 * Bug 40622: Update obfs4proxy to 0.0.14 in Tor Browser [tor-browser-build] * Windows + macOS + Linux * Bug 31064: Letterboxing is enabled in priviledged contexts too [tor-browser] + * Bug 31821: reapply window.open() clamping [tor-browser] * Bug 32411: Consider adding about:tor and others to the list of pages that do not need letterboxing [tor-browser] + * Bug 40081: Letterboxing since 32220 affected by layout.css.devPixelsPerPx [tor-browser] + * Bug 40767: 1px white border visible on fullscreen video playback [tor-browser] * Bug 41105: Tor Browser Does Not Clear CORS Preflight Cache despite creating a “New Identity” [tor-browser] * Bug 41413: Backup intl.locale.requested in 11.5.x [tor-browser] + * Bug 41433: Should letterboxing take in account optional components' heights? [tor-browser] * Bug 41434: Letterboxing bypass through secondary tab (popup/popunder...) [tor-browser] * Bug 41456: Backport ESR 102.5 security fixes to 91.13-based Tor Browser [tor-browser] * Bug 41460: Migrate new identity and security level preferences in 11.5.8 [tor-browser] @@ -232,7 +415,6 @@ Tor Browser 11.5.5 - October 20 2022 Tor Browser 11.5.4 - October 11 2022 * All Platforms - * Bug 40580: Add support for uk (ukranian) locale [tor-browser-build] * Bug 40629: Bump snowflake version to 9ce1de4eee4e [tor-browser-build] * Bug 40633: Remove Team Cymru hard-coded bridges [tor-browser-build] * Bug 41326: Update preference for remoteRecipes [tor-browser] @@ -334,7 +516,7 @@ Tor Browser 12.0a2 - September 1 2022 * Update Go to 1.18.5 * Bug 40574: Improve tools/signing/android-signing [tor-browser-build] * Bug 40582: Prepared TBA to use Mozilla 102 components [tor-browser-build] - * Bug 40604: Bug 40604: Fix binutils build on android [tor-browser-build] + * Bug 40604: Fix binutils build on android [tor-browser-build] Tor Browser 11.5.3 - August 29 2022 * Android diff --git a/projects/browser/allowed_addons.json b/projects/browser/allowed_addons.json index 60846f7b..d9672f63 100644 --- a/projects/browser/allowed_addons.json +++ b/projects/browser/allowed_addons.json @@ -17,7 +17,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…" } ], - "average_daily_users": 909198, + "average_daily_users": 915519, "categories": { "android": [ "experimental", @@ -221,10 +221,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5584, - "bayesian_average": 4.557180943955026, - "count": 4710, - "text_count": 1504 + "average": 4.5589, + "bayesian_average": 4.557679323413176, + "count": 4716, + "text_count": 1505 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", "requires_payment": false, @@ -321,7 +321,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/", - "weekly_downloads": 25656 + "weekly_downloads": 28250 }, "notes": null }, @@ -337,7 +337,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 669887, + "average_daily_users": 669677, "categories": { "android": [ "security-privacy" @@ -501,7 +501,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/versions/", - "weekly_downloads": 7804 + "weekly_downloads": 6221 }, "notes": null }, @@ -517,7 +517,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…" } ], - "average_daily_users": 256617, + "average_daily_users": 257360, "categories": { "android": [ "security-privacy" @@ -733,9 +733,9 @@ }, "ratings": { "average": 4.82, - "bayesian_average": 4.815284382393805, + "bayesian_average": 4.815277608880884, "count": 1300, - "text_count": 235 + "text_count": 234 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", "requires_payment": false, @@ -820,7 +820,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/", - "weekly_downloads": 5014 + "weekly_downloads": 5300 }, "notes": null }, @@ -836,7 +836,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 1080325, + "average_daily_users": 1084595, "categories": { "android": [ "security-privacy" @@ -1358,10 +1358,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7978, - "bayesian_average": 4.794944343168069, - "count": 2136, - "text_count": 419 + "average": 4.7954, + "bayesian_average": 4.792545624484679, + "count": 2141, + "text_count": 421 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", "requires_payment": false, @@ -1385,7 +1385,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/", - "weekly_downloads": 23645 + "weekly_downloads": 19509 }, "notes": null }, @@ -1401,7 +1401,7 @@ "picture_url": null } ], - "average_daily_users": 6109476, + "average_daily_users": 6142453, "categories": { "android": [ "security-privacy" @@ -1565,7 +1565,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2022-11-21T14:05:21Z", + "last_updated": "2022-11-29T17:10:20Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1711,9 +1711,9 @@ }, "ratings": { "average": 4.7782, - "bayesian_average": 4.777784409823513, - "count": 14615, - "text_count": 3832 + "bayesian_average": 4.777784259376361, + "count": 14646, + "text_count": 3840 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1775,7 +1775,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/", - "weekly_downloads": 145268 + "weekly_downloads": 150038 }, "notes": null }, @@ -1791,7 +1791,7 @@ "picture_url": null } ], - "average_daily_users": 137691, + "average_daily_users": 138306, "categories": { "android": [ "photos-media" @@ -1888,9 +1888,9 @@ "category": "recommended" }, "ratings": { - "average": 4.5084, - "bayesian_average": 4.503134943951076, - "count": 1074, + "average": 4.5088, + "bayesian_average": 4.503520963576624, + "count": 1075, "text_count": 399 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", @@ -1913,7 +1913,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…", - "weekly_downloads": 367 + "weekly_downloads": 364 }, "notes": null }, @@ -1929,7 +1929,7 @@ "picture_url": null } ], - "average_daily_users": 93297, + "average_daily_users": 93276, "categories": { "android": [ "experimental", @@ -2066,7 +2066,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/", - "weekly_downloads": 578 + "weekly_downloads": 611 }, "notes": null }, @@ -2082,7 +2082,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…" } ], - "average_daily_users": 241693, + "average_daily_users": 242839, "categories": { "android": [ "photos-media", @@ -2300,9 +2300,9 @@ "category": "recommended" }, "ratings": { - "average": 4.6475, - "bayesian_average": 4.6426080367355835, - "count": 1200, + "average": 4.6481, + "bayesian_average": 4.643208419519093, + "count": 1202, "text_count": 234 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", @@ -2324,7 +2324,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/", - "weekly_downloads": 3908 + "weekly_downloads": 4261 }, "notes": null }, @@ -2347,7 +2347,7 @@ "picture_url": null } ], - "average_daily_users": 97618, + "average_daily_users": 98361, "categories": { "android": [ "other" @@ -2629,9 +2629,9 @@ "category": "recommended" }, "ratings": { - "average": 4.4413, - "bayesian_average": 4.436575665528032, - "count": 1176, + "average": 4.4377, + "bayesian_average": 4.432981831118983, + "count": 1179, "text_count": 316 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", @@ -2652,7 +2652,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/", - "weekly_downloads": 37 + "weekly_downloads": 45 }, "notes": null }, @@ -2668,7 +2668,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…" } ], - "average_daily_users": 331471, + "average_daily_users": 331130, "categories": { "android": [ "performance", @@ -2785,7 +2785,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2022-11-22T09:08:25Z", + "last_updated": "2022-12-04T09:05:24Z", "name": { "de": "NoScript", "el": "NoScript", @@ -2857,10 +2857,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4093, - "bayesian_average": 4.406550750110661, - "count": 2006, - "text_count": 784 + "average": 4.4075, + "bayesian_average": 4.404750805731901, + "count": 2010, + "text_count": 787 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", "requires_payment": false, @@ -2904,7 +2904,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/", - "weekly_downloads": 7527 + "weekly_downloads": 7694 }, "notes": null }, @@ -2920,7 +2920,7 @@ "picture_url": null } ], - "average_daily_users": 140511, + "average_daily_users": 140965, "categories": { "android": [ "performance", @@ -3034,10 +3034,10 @@ "category": "recommended" }, "ratings": { - "average": 3.9128, - "bayesian_average": 3.90842770432453, - "count": 1089, - "text_count": 388 + "average": 3.911, + "bayesian_average": 3.906620181546117, + "count": 1090, + "text_count": 390 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", "requires_payment": false, @@ -3056,7 +3056,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…", - "weekly_downloads": 1431 + "weekly_downloads": 1452 }, "notes": null } diff --git a/projects/fenix/config b/projects/fenix/config index da63a480..f7ab78ba 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-build6' +git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-2-build1' git_url: https://gitlab.torproject.org/tpo/applications/fenix.git tag_gpg_id: 1 gpg_keyring: @@ -14,7 +14,7 @@ container: var: fenix_version: 102.2.1 torbrowser_branch: 12.0 - git_branch: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1' + git_branch: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-2' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 37 diff --git a/projects/firefox/config b/projects/firefox/config index 782be74f..4faade0d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -14,8 +14,8 @@ container: var: firefox_platform_version: 102.5.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - browser_branch: '12.0-1' - browser_build: 4 + browser_branch: '12.0-2' + browser_build: 1 branding_directory: 'browser/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_osname: '[% c("var/osname") %]' diff --git a/projects/geckoview/config b/projects/geckoview/config index d60a24a8..b0396106 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build4' +git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://gitlab.torproject.org/tpo/applications/tor-browser.git git_submodule: 1 diff --git a/projects/manual/config b/projects/manual/config index 64fac451..2b80bd5d 100644 --- a/projects/manual/config +++ b/projects/manual/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 # To update, see doc/how-to-update-the-manual.txt # Remember to update also the package's hash, with the version! -version: 56847 +version: 58611 filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 @@ -19,6 +19,6 @@ input_files: - project: container-image - URL: 'https://people.torproject.org/~richard/tbb_files/manual_[% c("version") %].zip' name: manual - sha256sum: f22d6206c668eee194e19bc27f39e4bbe1d21c20dc69064f67dc3f9db52525e9 + sha256sum: c5466b54474ca16095f9d22ea7f092941634b50e7c63673853766e26fd53b1c0 - filename: packagemanual.py name: package_script diff --git a/projects/tba-translation/config b/projects/tba-translation/config index 0f50c3fd..d8cf1102 100644 --- a/projects/tba-translation/config +++ b/projects/tba-translation/config @@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://gitlab.torproject.org/tpo/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. -git_hash: 462686c5f3fc57ba17ea8804c76e425682ed522f +git_hash: 5c29c501b58ce41df844079e4b841aa475a3d2d4 version: '[% c("abbrev") %]' diff --git a/projects/tor/config b/projects/tor/config index 77adad7d..d5f62ce0 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 0.4.7.11 +version: 0.4.7.12 git_hash: 'tor-[% c("version") %]' git_url: https://gitlab.torproject.org/tpo/core/tor.git git_submodule: 1 diff --git a/projects/translation-base-browser-fluent/config b/projects/translation-base-browser-fluent/config index d3e8f73b..9c78413b 100644 --- a/projects/translation-base-browser-fluent/config +++ b/projects/translation-base-browser-fluent/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://gitlab.torproject.org/tpo/translation.git -git_hash: 55b370953218b77f3bee6fc7b819bc8c9a7bb699 +git_hash: 0a69485d1b27d6a76ab98c622b09db8b3bca5a3c version: '[% c("abbrev") %]' targets: diff --git a/projects/translation-base-browser/config b/projects/translation-base-browser/config index 7fd10ca0..7f371c2a 100644 --- a/projects/translation-base-browser/config +++ b/projects/translation-base-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://gitlab.torproject.org/tpo/translation.git -git_hash: 7bcd63fc23945231facd75d1316c534c12f08a31 +git_hash: 5bcca955007294df0e6e837710e8049b140fc6fd version: '[% c("abbrev") %]' diff --git a/rbm.conf b/rbm.conf index cf273e44..cd1acba1 100644 --- a/rbm.conf +++ b/rbm.conf @@ -71,10 +71,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '12.0a5' + torbrowser_version: '12.0' torbrowser_build: 'build1' torbrowser_incremental_from: - - 12.0a4 + - 11.5.8 build_mar: 1 # By default, we sort the list of installed packages. This allows sharing # containers with identical list of packages, even if they are not listed -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: Bug 40704: Update mar-tools filename for macos, in tools/update-responses/update_responses
by gitolite role 06 Dec '22

06 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new a7d80ad3 Bug 40704: Update mar-tools filename for macos, in tools/update-responses/update_responses a7d80ad3 is described below commit a7d80ad340febd1b1adac09201acf387c9fb9652 Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Tue Dec 6 11:26:02 2022 +0100 Bug 40704: Update mar-tools filename for macos, in tools/update-responses/update_responses --- tools/update-responses/update_responses | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 5725edbb..fec9bcde 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -475,7 +475,7 @@ sub write_downloads_json { sub marzip_path { my ($config, $version) = @_; - for my $osname (qw/linux64 linux32 mac64 win64 win32/) { + for my $osname (qw/linux64 linux32 macos-x86_64 win64 win32/) { my $marzip = version_dir($config, $version) . "/mar-tools-$osname.zip"; return $marzip if -f $marzip; } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch maint-12.0 updated (1adc743f -> e8aed7d1)
by gitolite role 06 Dec '22

06 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch maint-12.0 in repository builders/tor-browser-build. from 1adc743f Bug 40645: Remove unused signing keys and create individual keyrings for Tor Project developers add c1f0460a Bug 40702: Fix geckoview branch for nightly new e8aed7d1 Bug 40678: Force all 11.5 users to update through 11.5.8 before 12.0 The 1 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. Summary of changes: projects/geckoview/config | 2 +- projects/release/update_responses_config.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 1