- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.5-1] fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (＠pierov) 04 Dec '24

04 Dec '24

Pier Angelo Vendrame pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 395fc108 by cypherpunks1 at 2024-12-04T09:32:06+00:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Bug 43334: Restore RemoteSettings dumps for devtools-compatibility-browsers and devtools-devices - - - - - 1 changed file: - services/settings/dumps/main/moz.build Changes: ===================================== services/settings/dumps/main/moz.build ===================================== @@ -14,6 +14,8 @@ if not CONFIG["MOZ_BUILD_APP"].startswith("mobile/"): FINAL_TARGET_FILES.defaults.settings.main += [ "anti-tracking-url-decoration.json", "cookie-banner-rules-list.json", + "devtools-compatibility-browsers.json", + "devtools-devices.json", "example.json", "hijack-blocklists.json", "password-rules.json", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/395fc10… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/395fc10… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.5-1] 2 commits: Revert "Bug 43099: 2024 YEC"
by morgan (＠morgan) 03 Dec '24

03 Dec '24

morgan pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: f905a88c by Pier Angelo Vendrame at 2024-12-03T19:11:20+00:00 Revert "Bug 43099: 2024 YEC" Bug 43343: Revert YEC 2024 This reverts commit 245cd26bd665facee04c41032efd5687ed8dc625. - - - - - 035f30c6 by Pier Angelo Vendrame at 2024-12-03T19:11:20+00:00 Revert "Bug 43098: Year End Campaign 2024." Bug 43343: Revert YEC 2024 This reverts commit 31d3d5e6556a254802ad3f9754497305c2c77187. - - - - - 17 changed files: - browser/components/BrowserGlue.sys.mjs - browser/components/abouttor/AboutTorChild.sys.mjs - browser/components/abouttor/AboutTorParent.sys.mjs - browser/components/abouttor/content/aboutTor.css - browser/components/abouttor/content/aboutTor.html - browser/components/abouttor/content/aboutTor.js - − browser/components/abouttor/content/yec-2024-browse.svg - − browser/components/abouttor/content/yec-2024-fonts.css - − browser/components/abouttor/content/yec-2024-heart.svg - − browser/components/abouttor/content/yec-2024-search.svg - − browser/components/abouttor/content/yec-2024-speak.svg - browser/components/abouttor/jar.mn - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeScreenViewModel.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt - − mobile/android/fenix/app/src/main/res/drawable/heart.xml - − mobile/android/fenix/app/src/main/res/drawable/illo_green_browse.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c1951f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c1951f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.5-1] 3 commits: Bug 43340: Add mozconfig-linux-aarch64-dev
by morgan (＠morgan) 03 Dec '24

03 Dec '24

morgan pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: d1eed871 by NoisyCoil at 2024-12-03T18:56:33+00:00 Bug 43340: Add mozconfig-linux-aarch64-dev Copy mozconfig-linux-x86_64-dev, except that linux-aarch64 does not support the {enable,disable}-eme options - - - - - 85faa5f2 by NoisyCoil at 2024-12-03T18:56:33+00:00 Bug 43340: Fetch aarch64 alphas for linux aarch64 dev builds - - - - - c1951fdb by NoisyCoil at 2024-12-03T18:56:33+00:00 Bug 43340: Use the correct vendor in linux aarch64 dev builds - - - - - 3 changed files: - + mozconfig-linux-aarch64-dev - tools/torbrowser/Makefile - tools/torbrowser/fetch.sh Changes: ===================================== mozconfig-linux-aarch64-dev ===================================== @@ -0,0 +1,20 @@ +. $topsrcdir/browser/config/mozconfigs/tor-browser + +# This mozconfig file is not used in official builds. +# It is only intended to be used when doing incremental Linux builds +# during development. + +# Moz switched to lld for all Linux targets in Bug 1839739. +ac_add_options --enable-linker=lld + +export MOZILLA_OFFICIAL= +export MOZ_APP_REMOTINGNAME="Tor Browser Dev" +ac_add_options --with-branding=browser/branding/tb-nightly + +ac_add_options --enable-default-toolkit=cairo-gtk3 + +ac_add_options --disable-strip +ac_add_options --disable-install-strip + +ac_add_options --with-base-browser-version=dev-build +ac_add_options --disable-base-browser-update ===================================== tools/torbrowser/Makefile ===================================== @@ -12,11 +12,17 @@ ifeq ($(ARCHITECTURE), "arm64") ARCHITECTURE = "aarch64" endif +ifeq ($(ARCHITECTURE), "aarch64") + LINUX_VENDOR = "unknown" +else + LINUX_VENDOR = "pc" +endif + # Define build output path based on the platform. ifeq ("$(shell uname)", "Darwin") BUILD_OUTPUT = "$(DEV_ROOT)/obj-$(ARCHITECTURE)-apple-darwin$(shell uname -r)" else - BUILD_OUTPUT = "$(DEV_ROOT)/obj-$(ARCHITECTURE)-pc-linux-gnu" + BUILD_OUTPUT = "$(DEV_ROOT)/obj-$(ARCHITECTURE)-$(LINUX_VENDOR)-linux-gnu" endif # Define the run command based on the platform. ===================================== tools/torbrowser/fetch.sh ===================================== @@ -10,7 +10,7 @@ TOR_BROWSER_VERSION=$(grep -Eo "\"version\":\"[0-9.a]+\"" downloads.json | grep if [ "$(uname)" = "Darwin" ]; then TOR_BROWSER_PACKAGE="tor-browser-macos-${TOR_BROWSER_VERSION}.dmg" else - TOR_BROWSER_PACKAGE="tor-browser-linux-x86_64-${TOR_BROWSER_VERSION}.tar.xz" + TOR_BROWSER_PACKAGE="tor-browser-linux-$(uname -m)-${TOR_BROWSER_VERSION}.tar.xz" fi TOR_BROWSER_PACKAGE_URL="https://dist.torproject.org/torbrowser/${TOR_BROWSER_VERSION}/${TOR_BROWSER…" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/efd91f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/efd91f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.0-1] 2 commits: fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
by Pier Angelo Vendrame (＠pierov) 03 Dec '24

03 Dec '24

Pier Angelo Vendrame pushed to branch tor-browser-128.5.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 096588f1 by Pier Angelo Vendrame at 2024-12-03T10:09:31+01:00 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser Bug 42690: Add a Makefile target to build APKs. Now that we use a monorepo, we can extend our existing tools to build also Fenix and to install it via adb. Also, update the env templates. - - - - - 174d3f74 by Pier Angelo Vendrame at 2024-12-03T10:09:33+01:00 fixup! [android] Modify build system Bug 42690: Add a Makefile target to build APKs. Update the paths on tba-sign-devbuilds.sh (and make them more generic when possible). - - - - - 10 changed files: - mobile/android/fenix/tools/tba-sign-devbuilds.sh - tools/geckoview/Makefile - tools/geckoview/android-env-linux-template.sh - tools/geckoview/android-env-macos-template.sh - + tools/geckoview/build-fenix.sh - tools/geckoview/build.sh → tools/geckoview/build-geckoview.sh - tools/geckoview/clobber.sh - tools/geckoview/config.sh - − tools/geckoview/fataar.py - − tools/geckoview/package-gradle.sh Changes: ===================================== mobile/android/fenix/tools/tba-sign-devbuilds.sh ===================================== @@ -2,20 +2,38 @@ cd "$(dirname $(realpath "$0"))/.." -if [ -z "$TOR_BROWSER_BUILD" ]; then - TOR_BROWSER_BUILD=../../tor-browser-build +if [ -z "$APKSIGNER_ARGS" ]; then + if [ -z "$QA_KEY" ]; then + if [ -z "$TOR_BROWSER_BUILD" ]; then + TOR_BROWSER_BUILD=../../../../tor-browser-build + fi + QA_KEY="$TOR_BROWSER_BUILD/projects/browser/android-qa.keystore" + fi + if [ ! -f "$QA_KEY" ]; then + echo "The QA key has not been found." + echo "Please define either \$QA_KEY with its path, or \$TOR_BROWSER_BUILD with the path to tor-browser-build" + exit 2 + fi + APKSIGNER_ARGS="--ks "$QA_KEY" --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android" fi -key="$TOR_BROWSER_BUILD/projects/browser/android-qa.keystore" -if [ ! -f "$key" ]; then - echo "Please define TOR_BROWSER_BUILD with the path to tor-browser-build" - exit 2 + +if [ -z "$ANDROID_HOME" ]; then + ANDROID_HOME=~/Android fi -tools="$ANDROID_HOME/build-tools/31.0.0" -apksigner="$tools/apksigner" -zipalign="$tools/zipalign" -if [ ! -x "$apksigner" ]; then - echo "apksigner not found at $apksigner. Please make sure ANDROID_HOME is defined" +function find_tool() { + tool="$(find $ANDROID_HOME -name "$1" | head -1)" + if [ -z "$tool" ]; then + tool=$(which $1) + fi + echo $tool +} + +apksigner="$(find_tool apksigner)" +zipalign="$(find_tool zipalign)" +if [ -z "$apksigner" -o ! -x "$apksigner" -o -z "$zipalign" -o ! -x "$zipalign" ]; then + echo "apksigner or zipalign not found." + echo "Please make sure they are on your \$PATH, or define \$ANDROID_HOME." exit 3 fi @@ -40,8 +58,8 @@ sign () { popd > /dev/null rm -f "$aligned" "$zipalign" -p 4 "$apk" "$aligned" - "$apksigner" sign --ks "$key" --in "$aligned" --out "$out" --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android - echo "Signed $out" + echo "Signing $out" + "$apksigner" sign --in "$aligned" --out "$out" $APKSIGNER_ARGS } for channel in app/build/outputs/apk/fenix/*; do ===================================== tools/geckoview/Makefile ===================================== @@ -1,9 +1,15 @@ .DEFAULT_GOAL := all # one of armv7 aarch64 x86 x86_64 -ARCH=aarch64 +ARCH := aarch64 +ANDROID_ARCH := $(ARCH) +ifeq ($(ANDROID_ARCH),aarch64) + ANDROID_ARCH := arm64-v8a +endif +ifeq ($(ANDROID_ARCH),armv7) + ANDROID_ARCH := armeabi-v7a +endif -ARCHS=$(ARCH) OS="${shell uname}" # https://stackoverflow.com/questions/18136918/how-to-get-current-relative-di… @@ -17,23 +23,33 @@ clobber: env config: env ./config.sh $(DEV_ROOT) $(ARCH) -build: env - ./build.sh $(DEV_ROOT) $(ARCH) +geckoview: env + ./build-geckoview.sh $(DEV_ROOT) $(ARCH) -fataar: env - bash -c "source android-env.sh && ./fataar.py $(DEV_ROOT) $(ARCHS)" - -package: env - ./package-gradle.sh $(DEV_ROOT) $(ARCH) - -show: - ls -lh ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni/ - ls -lh ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni/$(shell ls ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni | tail -n 2 | head -n 1) +# These targets do not depend on GeckoView so that you can build only Fenix if +# you are not changing GV code. +fenix-release: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Release +fenix-beta: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Beta +fenix-nightly: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Nightly +fenix-debug: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Debug env: test -e android-env.sh || { echo "copy android-env-...-template.sh to android-env.sh and edit appropriatly"; exit 1; } -all: env build package +install-release: + adb install "$(DEV_ROOT)/mobile/android/fenix/app/build/outputs/apk/fenix/release/app-fenix-$(ANDROID_ARCH)-release-signed.apk" +install-beta: + adb install "$(DEV_ROOT)/mobile/android/fenix/app/build/outputs/apk/fenix/beta/app-fenix-$(ANDROID_ARCH)-beta-signed.apk" +install-nightly: + adb install "$(DEV_ROOT)/mobile/android/fenix/app/build/outputs/apk/fenix/nightly/app-fenix-$(ANDROID_ARCH)-nightly-signed.apk" + +all: env geckoview fenix-nightly install-nightly +all-release: env geckoview fenix-release install-release +all-beta: env geckoview fenix-beta install-beta jslint: ./jslint.sh $(DEV_ROOT) $(JS) ===================================== tools/geckoview/android-env-linux-template.sh ===================================== @@ -1,7 +1,6 @@ -export MOZ_BUILD_DATE=20230710165010 # This should match the data in [firefox-android](https://gitlab.torproject.org/tpo/applications/firefox-and… ~ln 12's def of the variable *version*, the date component export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 export ANDROID_HOME=$HOME/.mozbuild/android-sdk-linux/ # or $HOME/Android/Sdk/ # Or .../android-toolchain/android-sdk-linux if you extract android-toolchain from tor-browser-build -export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313/ # for 115esr -export GRADLE_HOME=/FULL/PATH/TO/tor-browser-build/out/gradle/gradle-7.5.1 # Or the version that we currently use +export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/r26c/ # for 128esr +export GRADLE_HOME=/FULL/PATH/TO/tor-browser-build/out/gradle/gradle-8.8 # Or the version that we currently use export LOCAL_DEV_BUILD=1 export PATH=/FULL/PATH/TO/tor-browser-build/out/clang/clang-16.x.y-arm/bin/:$PATH # prepend our newly built and assembled clang to the path so it gets used to build geckoview ===================================== tools/geckoview/android-env-macos-template.sh ===================================== @@ -1,4 +1,3 @@ -export MOZ_BUILD_DATE=20230710165010 # This should match the data in [firefox-android](https://gitlab.torproject.org/tpo/applications/firefox-and… ~ln 12's def of the variable *version*, the date component export JAVA_HOME=/opt/homebrew/opt/openjdk(a)11/libexec/openjdk.jdk/Contents/Home/ # for arm64. Or JAVA_HOME=/usr/local/opt/openjdk(a)11/libexec/openjdk.jdk/Contents/Home/ for x86_64. export ANDROID_HOME=$HOME/Library/Android/sdk # or $HOME/.mozbuild/android-sdk-macosx/ export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313 # will need to download NDK 23.2.8568313 via android studio ===================================== tools/geckoview/build-fenix.sh ===================================== @@ -0,0 +1,11 @@ +#!/bin/bash +set -e +DEV_ROOT=$1 +ARCH=$2 +VARIANT=$3 + +source android-env.sh + +cd $DEV_ROOT/mobile/android/fenix +MOZCONFIG=mozconfig-android-$ARCH $GRADLE_HOME/bin/gradle --no-daemon -Dorg.gradle.jvmargs=-Xmx20g -PdisableOptimization assemble$VARIANT +tools/tba-sign-devbuilds.sh ===================================== tools/geckoview/build.sh → tools/geckoview/build-geckoview.sh ===================================== @@ -6,4 +6,4 @@ ARCH=$2 source android-env.sh cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach build +MOZCONFIG=mozconfig-android-$ARCH ./mach build ===================================== tools/geckoview/clobber.sh ===================================== @@ -7,4 +7,3 @@ source android-env.sh cd $DEV_ROOT MOZCONFIG=mozconfig-android-$ARCH ./mach clobber -MOZCONFIG=mozconfig-android-all ./mach clobber ===================================== tools/geckoview/config.sh ===================================== @@ -6,4 +6,4 @@ ARCH=$2 source android-env.sh cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach configure --without-wasm-sandboxed-libraries +MOZCONFIG=mozconfig-android-$ARCH ./mach configure --without-wasm-sandboxed-libraries ===================================== tools/geckoview/fataar.py deleted ===================================== @@ -1,52 +0,0 @@ -#!/usr/bin/env python3 -import os -import re -import subprocess -import sys - -dev_root = sys.argv[1] -archs_in = re.split("\\s+|,", sys.argv[2]) if len(sys.argv) >= 3 else [] -archs_out = [] -env = dict(os.environ) - -env["MOZCONFIG"] = "mozconfig-android-all" -if "armv7" in archs_in: - env["MOZ_ANDROID_FAT_AAR_ARMEABI_V7A"] = ( - dev_root - + "/obj-arm-linux-androideabi/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("armeabi-v7a") -if "aarch64" in archs_in: - env["MOZ_ANDROID_FAT_AAR_ARM64_V8A"] = ( - dev_root - + "/obj-aarch64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("arm64-v8a") -if "x86" in archs_in or "i686" in archs_in: - env["MOZ_ANDROID_FAT_AAR_X86"] = ( - dev_root - + "/obj-i386-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("x86") -if "x86_64" in archs_in or "x86-64" in archs_in: - env["MOZ_ANDROID_FAT_AAR_X86_64"] = ( - dev_root - + "/obj-x86_64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("x86_64") -env["MOZ_ANDROID_FAT_AAR_ARCHITECTURES"] = ",".join(archs_out) - -if not archs_out: - print( - "The architectures have not specified or are not valid.", - file=sys.stderr, - ) - print('Usage: make fat-aar ARCHS="$archs"', file=sys.stderr) - print( - "Valid architectures are armv7 aarch64 x86 x86_64, and must be separated with a space.", - file=sys.stderr, - ) - sys.exit(1) - -subprocess.run(["./mach", "configure"], cwd=dev_root, env=env, check=True) -subprocess.run(["./mach", "build"], cwd=dev_root, env=env, check=True) ===================================== tools/geckoview/package-gradle.sh deleted ===================================== @@ -1,15 +0,0 @@ -#!/bin/bash -set -e -DEV_ROOT=$1 -ARCH=$2 - -source android-env.sh - -env ARCHS=$ARCH make fataar - -cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach build binaries -MOZCONFIG=mozconfig-android-$ARCH ./mach gradle geckoview:publishWithGeckoBinariesDebugPublicationToMavenRepository -MOZCONFIG=mozconfig-android-all ./mach gradle geckoview:publishWithGeckoBinariesDebugPublicationToMavenLocal exoplayer2:publishDebugPublicationToMavenLocal - - View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8cad63… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8cad63… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.5-1] 2 commits: fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
by Pier Angelo Vendrame (＠pierov) 03 Dec '24

03 Dec '24

Pier Angelo Vendrame pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 81108ca4 by Pier Angelo Vendrame at 2024-12-03T09:45:46+01:00 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser Bug 42690: Add a Makefile target to build APKs. Now that we use a monorepo, we can extend our existing tools to build also Fenix and to install it via adb. Also, update the env templates. - - - - - efd91fc3 by Pier Angelo Vendrame at 2024-12-03T09:45:52+01:00 fixup! [android] Modify build system Bug 42690: Add a Makefile target to build APKs. Update the paths on tba-sign-devbuilds.sh (and make them more generic when possible). - - - - - 10 changed files: - mobile/android/fenix/tools/tba-sign-devbuilds.sh - tools/geckoview/Makefile - tools/geckoview/android-env-linux-template.sh - tools/geckoview/android-env-macos-template.sh - + tools/geckoview/build-fenix.sh - tools/geckoview/build.sh → tools/geckoview/build-geckoview.sh - tools/geckoview/clobber.sh - tools/geckoview/config.sh - − tools/geckoview/fataar.py - − tools/geckoview/package-gradle.sh Changes: ===================================== mobile/android/fenix/tools/tba-sign-devbuilds.sh ===================================== @@ -2,20 +2,38 @@ cd "$(dirname $(realpath "$0"))/.." -if [ -z "$TOR_BROWSER_BUILD" ]; then - TOR_BROWSER_BUILD=../../tor-browser-build +if [ -z "$APKSIGNER_ARGS" ]; then + if [ -z "$QA_KEY" ]; then + if [ -z "$TOR_BROWSER_BUILD" ]; then + TOR_BROWSER_BUILD=../../../../tor-browser-build + fi + QA_KEY="$TOR_BROWSER_BUILD/projects/browser/android-qa.keystore" + fi + if [ ! -f "$QA_KEY" ]; then + echo "The QA key has not been found." + echo "Please define either \$QA_KEY with its path, or \$TOR_BROWSER_BUILD with the path to tor-browser-build" + exit 2 + fi + APKSIGNER_ARGS="--ks "$QA_KEY" --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android" fi -key="$TOR_BROWSER_BUILD/projects/browser/android-qa.keystore" -if [ ! -f "$key" ]; then - echo "Please define TOR_BROWSER_BUILD with the path to tor-browser-build" - exit 2 + +if [ -z "$ANDROID_HOME" ]; then + ANDROID_HOME=~/Android fi -tools="$ANDROID_HOME/build-tools/31.0.0" -apksigner="$tools/apksigner" -zipalign="$tools/zipalign" -if [ ! -x "$apksigner" ]; then - echo "apksigner not found at $apksigner. Please make sure ANDROID_HOME is defined" +function find_tool() { + tool="$(find $ANDROID_HOME -name "$1" | head -1)" + if [ -z "$tool" ]; then + tool=$(which $1) + fi + echo $tool +} + +apksigner="$(find_tool apksigner)" +zipalign="$(find_tool zipalign)" +if [ -z "$apksigner" -o ! -x "$apksigner" -o -z "$zipalign" -o ! -x "$zipalign" ]; then + echo "apksigner or zipalign not found." + echo "Please make sure they are on your \$PATH, or define \$ANDROID_HOME." exit 3 fi @@ -40,8 +58,8 @@ sign () { popd > /dev/null rm -f "$aligned" "$zipalign" -p 4 "$apk" "$aligned" - "$apksigner" sign --ks "$key" --in "$aligned" --out "$out" --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android - echo "Signed $out" + echo "Signing $out" + "$apksigner" sign --in "$aligned" --out "$out" $APKSIGNER_ARGS } for channel in app/build/outputs/apk/fenix/*; do ===================================== tools/geckoview/Makefile ===================================== @@ -1,9 +1,15 @@ .DEFAULT_GOAL := all # one of armv7 aarch64 x86 x86_64 -ARCH=aarch64 +ARCH := aarch64 +ANDROID_ARCH := $(ARCH) +ifeq ($(ANDROID_ARCH),aarch64) + ANDROID_ARCH := arm64-v8a +endif +ifeq ($(ANDROID_ARCH),armv7) + ANDROID_ARCH := armeabi-v7a +endif -ARCHS=$(ARCH) OS="${shell uname}" # https://stackoverflow.com/questions/18136918/how-to-get-current-relative-di… @@ -17,23 +23,33 @@ clobber: env config: env ./config.sh $(DEV_ROOT) $(ARCH) -build: env - ./build.sh $(DEV_ROOT) $(ARCH) +geckoview: env + ./build-geckoview.sh $(DEV_ROOT) $(ARCH) -fataar: env - bash -c "source android-env.sh && ./fataar.py $(DEV_ROOT) $(ARCHS)" - -package: env - ./package-gradle.sh $(DEV_ROOT) $(ARCH) - -show: - ls -lh ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni/ - ls -lh ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni/$(shell ls ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni | tail -n 2 | head -n 1) +# These targets do not depend on GeckoView so that you can build only Fenix if +# you are not changing GV code. +fenix-release: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Release +fenix-beta: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Beta +fenix-nightly: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Nightly +fenix-debug: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Debug env: test -e android-env.sh || { echo "copy android-env-...-template.sh to android-env.sh and edit appropriatly"; exit 1; } -all: env build package +install-release: + adb install "$(DEV_ROOT)/mobile/android/fenix/app/build/outputs/apk/fenix/release/app-fenix-$(ANDROID_ARCH)-release-signed.apk" +install-beta: + adb install "$(DEV_ROOT)/mobile/android/fenix/app/build/outputs/apk/fenix/beta/app-fenix-$(ANDROID_ARCH)-beta-signed.apk" +install-nightly: + adb install "$(DEV_ROOT)/mobile/android/fenix/app/build/outputs/apk/fenix/nightly/app-fenix-$(ANDROID_ARCH)-nightly-signed.apk" + +all: env geckoview fenix-nightly install-nightly +all-release: env geckoview fenix-release install-release +all-beta: env geckoview fenix-beta install-beta jslint: ./jslint.sh $(DEV_ROOT) $(JS) ===================================== tools/geckoview/android-env-linux-template.sh ===================================== @@ -1,7 +1,6 @@ -export MOZ_BUILD_DATE=20230710165010 # This should match the data in [firefox-android](https://gitlab.torproject.org/tpo/applications/firefox-and… ~ln 12's def of the variable *version*, the date component export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 export ANDROID_HOME=$HOME/.mozbuild/android-sdk-linux/ # or $HOME/Android/Sdk/ # Or .../android-toolchain/android-sdk-linux if you extract android-toolchain from tor-browser-build -export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313/ # for 115esr -export GRADLE_HOME=/FULL/PATH/TO/tor-browser-build/out/gradle/gradle-7.5.1 # Or the version that we currently use +export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/r26c/ # for 128esr +export GRADLE_HOME=/FULL/PATH/TO/tor-browser-build/out/gradle/gradle-8.8 # Or the version that we currently use export LOCAL_DEV_BUILD=1 export PATH=/FULL/PATH/TO/tor-browser-build/out/clang/clang-16.x.y-arm/bin/:$PATH # prepend our newly built and assembled clang to the path so it gets used to build geckoview ===================================== tools/geckoview/android-env-macos-template.sh ===================================== @@ -1,4 +1,3 @@ -export MOZ_BUILD_DATE=20230710165010 # This should match the data in [firefox-android](https://gitlab.torproject.org/tpo/applications/firefox-and… ~ln 12's def of the variable *version*, the date component export JAVA_HOME=/opt/homebrew/opt/openjdk(a)11/libexec/openjdk.jdk/Contents/Home/ # for arm64. Or JAVA_HOME=/usr/local/opt/openjdk(a)11/libexec/openjdk.jdk/Contents/Home/ for x86_64. export ANDROID_HOME=$HOME/Library/Android/sdk # or $HOME/.mozbuild/android-sdk-macosx/ export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313 # will need to download NDK 23.2.8568313 via android studio ===================================== tools/geckoview/build-fenix.sh ===================================== @@ -0,0 +1,11 @@ +#!/bin/bash +set -e +DEV_ROOT=$1 +ARCH=$2 +VARIANT=$3 + +source android-env.sh + +cd $DEV_ROOT/mobile/android/fenix +MOZCONFIG=mozconfig-android-$ARCH $GRADLE_HOME/bin/gradle --no-daemon -Dorg.gradle.jvmargs=-Xmx20g -PdisableOptimization assemble$VARIANT +tools/tba-sign-devbuilds.sh ===================================== tools/geckoview/build.sh → tools/geckoview/build-geckoview.sh ===================================== @@ -6,4 +6,4 @@ ARCH=$2 source android-env.sh cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach build +MOZCONFIG=mozconfig-android-$ARCH ./mach build ===================================== tools/geckoview/clobber.sh ===================================== @@ -7,4 +7,3 @@ source android-env.sh cd $DEV_ROOT MOZCONFIG=mozconfig-android-$ARCH ./mach clobber -MOZCONFIG=mozconfig-android-all ./mach clobber ===================================== tools/geckoview/config.sh ===================================== @@ -6,4 +6,4 @@ ARCH=$2 source android-env.sh cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach configure --without-wasm-sandboxed-libraries +MOZCONFIG=mozconfig-android-$ARCH ./mach configure --without-wasm-sandboxed-libraries ===================================== tools/geckoview/fataar.py deleted ===================================== @@ -1,52 +0,0 @@ -#!/usr/bin/env python3 -import os -import re -import subprocess -import sys - -dev_root = sys.argv[1] -archs_in = re.split("\\s+|,", sys.argv[2]) if len(sys.argv) >= 3 else [] -archs_out = [] -env = dict(os.environ) - -env["MOZCONFIG"] = "mozconfig-android-all" -if "armv7" in archs_in: - env["MOZ_ANDROID_FAT_AAR_ARMEABI_V7A"] = ( - dev_root - + "/obj-arm-linux-androideabi/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("armeabi-v7a") -if "aarch64" in archs_in: - env["MOZ_ANDROID_FAT_AAR_ARM64_V8A"] = ( - dev_root - + "/obj-aarch64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("arm64-v8a") -if "x86" in archs_in or "i686" in archs_in: - env["MOZ_ANDROID_FAT_AAR_X86"] = ( - dev_root - + "/obj-i386-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("x86") -if "x86_64" in archs_in or "x86-64" in archs_in: - env["MOZ_ANDROID_FAT_AAR_X86_64"] = ( - dev_root - + "/obj-x86_64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("x86_64") -env["MOZ_ANDROID_FAT_AAR_ARCHITECTURES"] = ",".join(archs_out) - -if not archs_out: - print( - "The architectures have not specified or are not valid.", - file=sys.stderr, - ) - print('Usage: make fat-aar ARCHS="$archs"', file=sys.stderr) - print( - "Valid architectures are armv7 aarch64 x86 x86_64, and must be separated with a space.", - file=sys.stderr, - ) - sys.exit(1) - -subprocess.run(["./mach", "configure"], cwd=dev_root, env=env, check=True) -subprocess.run(["./mach", "build"], cwd=dev_root, env=env, check=True) ===================================== tools/geckoview/package-gradle.sh deleted ===================================== @@ -1,15 +0,0 @@ -#!/bin/bash -set -e -DEV_ROOT=$1 -ARCH=$2 - -source android-env.sh - -env ARCHS=$ARCH make fataar - -cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach build binaries -MOZCONFIG=mozconfig-android-$ARCH ./mach gradle geckoview:publishWithGeckoBinariesDebugPublicationToMavenRepository -MOZCONFIG=mozconfig-android-all ./mach gradle geckoview:publishWithGeckoBinariesDebugPublicationToMavenLocal exoplayer2:publishDebugPublicationToMavenLocal - - View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6756b7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6756b7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.5-1] fixup! Bug 40933: Add tor-launcher functionality
by Pier Angelo Vendrame (＠pierov) 02 Dec '24

02 Dec '24

Pier Angelo Vendrame pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 6756b736 by Pier Angelo Vendrame at 2024-12-02T18:33:34+01:00 fixup! Bug 40933: Add tor-launcher functionality Bug 43326: Restrict the changes to LD_LIBRARY_PATH. We used to set LD_LIBRARY_PATH for the tor daemon before launching the browser, but this does not work well for some distributions, which link to the latest version of OpenSSL, whereas we link to the LTS. To avoid conflicts, we can set a custom LD_LIBRARY_PATH only for the tor daemon. - - - - - 2 changed files: - toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs - toolkit/components/tor-launcher/TorProcess.sys.mjs Changes: ===================================== toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs ===================================== @@ -5,6 +5,8 @@ * Tor Launcher Util JS Module *************************************************************************/ +import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs"; + const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { @@ -335,6 +337,13 @@ export const TorLauncherUtil = Object.freeze({ return Services.appinfo.OS === "Android"; }, + get isLinux() { + // Use AppConstants for Linux rather then appinfo because we are sure it + // will catch also various Unix flavors for which unofficial ports might + // exist (which should work as Linux, as far as we know). + return AppConstants.platform === "linux"; + }, + get isMac() { return Services.appinfo.OS === "Darwin"; }, ===================================== toolkit/components/tor-launcher/TorProcess.sys.mjs ===================================== @@ -125,6 +125,16 @@ export class TorProcess { stderr: "stdout", workdir: lazy.TorLauncherUtil.getTorFile("pt-startup-dir", false).path, }; + if (lazy.TorLauncherUtil.isLinux) { + let ldLibPath = Services.env.get("LD_LIBRARY_PATH") ?? ""; + if (ldLibPath) { + ldLibPath = ":" + ldLibPath; + } + options.environment = { + LD_LIBRARY_PATH: this.#exeFile.parent.path + ldLibPath, + }; + options.environmentAppend = true; + } this.#subprocess = await Subprocess.call(options); this.#status = TorProcessStatus.Running; } catch (e) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6756b73… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6756b73… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41328: Exclude tor dependencies from LD_LIBRARY_PATH.
by Pier Angelo Vendrame (＠pierov) 02 Dec '24

02 Dec '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: b7c816f8 by Pier Angelo Vendrame at 2024-12-02T18:34:39+01:00 Bug 41328: Exclude tor dependencies from LD_LIBRARY_PATH. We discovered in tor-browser#43326 that adding our OpenSSL to LD_LIBRARY_PATH might cause the browser not to work in some distros. So, we decided to add them to LD_LIBRARY_PATH only for the tor daemon, instead. - - - - - 1 changed file: - projects/firefox/start-firefox Changes: ===================================== projects/firefox/start-firefox ===================================== @@ -17,9 +17,6 @@ add_LD_LIBRARY_PATH() { if [ $? -ne 0 ]; then add_LD_LIBRARY_PATH "$basedir/[% IF c("var/tor-browser") -%]TorBrowser/Tor/[% END -%]libstdc++/" fi -[% IF c("var/tor-browser") -%] -add_LD_LIBRARY_PATH "$basedir/TorBrowser/Tor/" -[% END -%] export LD_LIBRARY_PATH exec "$basedir/[% c("var/exe_name") %].real" "$@" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 41329: Add no_install_recommends option to container-image
by boklm (＠boklm) 02 Dec '24

02 Dec '24

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 78039907 by NoisyCoil at 2024-12-02T17:22:49+01:00 Bug 41329: Add no_install_recommends option to container-image - - - - - 8a16e82b by NoisyCoil at 2024-12-02T17:22:51+01:00 Bug 41329: Set no_install_recommends for linux-aarch64 firefox Avoids installing python2.7-minimal:arm64, which is never used and whose postinst script tries to execute the arm64 native python binary on x86_64 (affects every Debian release where it still exists) - - - - - 2 changed files: - projects/container-image/config - projects/firefox/config Changes: ===================================== projects/container-image/config ===================================== @@ -64,8 +64,9 @@ pre: | res_deps = res_deps.sort.unique; END; IF res_deps.size; + SET no_install_recommends = pc(c('origin_project'), 'var/no_install_recommends', { step => c('origin_step') }); FOREACH pkg IN res_deps; - GET c('install_package', { pkg_name => pkg }); + GET c('install_package', { pkg_name => pkg, no_install_recommends => no_install_recommends }); GET "\n"; END; END; ===================================== projects/firefox/config ===================================== @@ -146,6 +146,7 @@ targets: linux-aarch64: var: + no_install_recommends: 1 arch_deps: - libgtk2.0-dev:arm64 - libgtk-3-dev:arm64 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 rbm for rbm#40081
by boklm (＠boklm) 02 Dec '24

02 Dec '24

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 2eb95d67 by Nicolas Vigier at 2024-12-02T17:13:42+01:00 Update rbm for rbm#40081 - - - - - 1 changed file: - rbm Changes: ===================================== rbm ===================================== @@ -1 +1 @@ -Subproject commit f18daa3f93d1aec674e4ba0dfbd22ac6afd6f8c9 +Subproject commit c6a40950607fa73861f81185764dff2bab150010 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/rbm][main] Bug 40081: Optionally pass --no-install-recommends to apt-get
by boklm (＠boklm) 02 Dec '24

02 Dec '24

boklm pushed to branch main at The Tor Project / Applications / RBM Commits: c6a40950 by NoisyCoil at 2024-12-02T17:05:29+01:00 Bug 40081: Optionally pass --no-install-recommends to apt-get - - - - - 1 changed file: - lib/RBM/DefaultConfig.pm Changes: ===================================== lib/RBM/DefaultConfig.pm ===================================== @@ -554,7 +554,7 @@ OPT_END my $dnf = 'rpm -q [% c("pkg_name") %] > /dev/null || dnf install -y [% c("pkg_name") %]'; my $zypper = 'rpm -q [% c("pkg_name") %] > /dev/null || zypper install [% c("pkg_name") %]'; my $urpmi = 'rpm -q [% c("pkg_name") %] > /dev/null || urpmi [% c("pkg_name") %]'; - my $apt = 'dpkg -s [% c("pkg_name") %] 2> /dev/null | grep -q "^Status: install ok installed\$" || DEBIAN_FRONTEND=noninteractive apt-get install -q -y [% c("pkg_name") %]'; + my $apt = 'dpkg -s [% c("pkg_name") %] 2> /dev/null | grep -q "^Status: install ok installed\$" || DEBIAN_FRONTEND=noninteractive apt-get install -q -y [% IF c("no_install_recommends") %]--no-install-recommends [% END %][% c("pkg_name") %]'; my %install = ( Fedora => $dnf, 'Fedora-20' => $yum, View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/c6a40950607fa73… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/c6a40950607fa73… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.5.0esr-14.5-1] fixup! Bug 43140: Tighten up fonts on Linux.
by Pier Angelo Vendrame (＠pierov) 02 Dec '24

02 Dec '24

Pier Angelo Vendrame pushed to branch mullvad-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: eb3fbc67 by Pier Angelo Vendrame at 2024-12-02T09:12:19+01:00 fixup! Bug 43140: Tighten up fonts on Linux. Bug 43330: System fonts leak when emptying the allow list on Linux. It seems for some reason we still need to define the configuration path and the file separately. - - - - - 1 changed file: - gfx/thebes/gfxFcPlatformFontList.cpp Changes: ===================================== gfx/thebes/gfxFcPlatformFontList.cpp ===================================== @@ -1356,20 +1356,20 @@ static nsresult SetFontconfigConfigFile() { nsCOMPtr<nsIProperties> dirSvc( do_GetService("@mozilla.org/file/directory_service;1")); NS_ENSURE_TRUE(dirSvc, NS_ERROR_NOT_AVAILABLE); - nsCOMPtr<nsIFile> appFile, confFile; + nsCOMPtr<nsIFile> appFile, confDir; nsresult rv = dirSvc->Get(XRE_EXECUTABLE_FILE, NS_GET_IID(nsIFile), getter_AddRefs(appFile)); NS_ENSURE_SUCCESS(rv, rv); - rv = appFile->GetParent(getter_AddRefs(confFile)); + rv = appFile->GetParent(getter_AddRefs(confDir)); NS_ENSURE_SUCCESS(rv, rv); - rv = confFile->AppendNative("fonts"_ns); - NS_ENSURE_SUCCESS(rv, rv); - rv = confFile->AppendNative("fonts.conf"_ns); + rv = confDir->AppendNative("fonts"_ns); NS_ENSURE_SUCCESS(rv, rv); nsAutoCString confPath; - rv = confFile->GetNativePath(confPath); - if (setenv("FONTCONFIG_FILE", confPath.BeginReading(), 1) != 0) { + rv = confDir->GetNativePath(confPath); + NS_ENSURE_SUCCESS(rv, rv); + if (NS_WARN_IF(setenv("FONTCONFIG_PATH", confPath.BeginReading(), 1) != 0 || + setenv("FONTCONFIG_FILE", "fonts.conf", 1) != 0)) { return NS_ERROR_FAILURE; } return NS_OK; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/eb3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/eb3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.5.0esr-14.5-1] fixup! Bug 43140: Tighten up fonts on Linux.
by Pier Angelo Vendrame (＠pierov) 02 Dec '24

02 Dec '24

Pier Angelo Vendrame pushed to branch base-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 5b784090 by Pier Angelo Vendrame at 2024-12-02T09:08:41+01:00 fixup! Bug 43140: Tighten up fonts on Linux. Bug 43330: System fonts leak when emptying the allow list on Linux. It seems for some reason we still need to define the configuration path and the file separately. - - - - - 1 changed file: - gfx/thebes/gfxFcPlatformFontList.cpp Changes: ===================================== gfx/thebes/gfxFcPlatformFontList.cpp ===================================== @@ -1356,20 +1356,20 @@ static nsresult SetFontconfigConfigFile() { nsCOMPtr<nsIProperties> dirSvc( do_GetService("@mozilla.org/file/directory_service;1")); NS_ENSURE_TRUE(dirSvc, NS_ERROR_NOT_AVAILABLE); - nsCOMPtr<nsIFile> appFile, confFile; + nsCOMPtr<nsIFile> appFile, confDir; nsresult rv = dirSvc->Get(XRE_EXECUTABLE_FILE, NS_GET_IID(nsIFile), getter_AddRefs(appFile)); NS_ENSURE_SUCCESS(rv, rv); - rv = appFile->GetParent(getter_AddRefs(confFile)); + rv = appFile->GetParent(getter_AddRefs(confDir)); NS_ENSURE_SUCCESS(rv, rv); - rv = confFile->AppendNative("fonts"_ns); - NS_ENSURE_SUCCESS(rv, rv); - rv = confFile->AppendNative("fonts.conf"_ns); + rv = confDir->AppendNative("fonts"_ns); NS_ENSURE_SUCCESS(rv, rv); nsAutoCString confPath; - rv = confFile->GetNativePath(confPath); - if (setenv("FONTCONFIG_FILE", confPath.BeginReading(), 1) != 0) { + rv = confDir->GetNativePath(confPath); + NS_ENSURE_SUCCESS(rv, rv); + if (NS_WARN_IF(setenv("FONTCONFIG_PATH", confPath.BeginReading(), 1) != 0 || + setenv("FONTCONFIG_FILE", "fonts.conf", 1) != 0)) { return NS_ERROR_FAILURE; } return NS_OK; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5b78409… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5b78409… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.5-1] fixup! Bug 43140: Tighten up fonts on Linux.
by morgan (＠morgan) 27 Nov '24

27 Nov '24

morgan pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: c454273c by Pier Angelo Vendrame at 2024-11-27T18:39:16+01:00 fixup! Bug 43140: Tighten up fonts on Linux. Bug 43330: System fonts leak when emptying the allow list on Linux. It seems for some reason we still need to define the configuration path and the file separately. - - - - - 1 changed file: - gfx/thebes/gfxFcPlatformFontList.cpp Changes: ===================================== gfx/thebes/gfxFcPlatformFontList.cpp ===================================== @@ -1356,20 +1356,20 @@ static nsresult SetFontconfigConfigFile() { nsCOMPtr<nsIProperties> dirSvc( do_GetService("@mozilla.org/file/directory_service;1")); NS_ENSURE_TRUE(dirSvc, NS_ERROR_NOT_AVAILABLE); - nsCOMPtr<nsIFile> appFile, confFile; + nsCOMPtr<nsIFile> appFile, confDir; nsresult rv = dirSvc->Get(XRE_EXECUTABLE_FILE, NS_GET_IID(nsIFile), getter_AddRefs(appFile)); NS_ENSURE_SUCCESS(rv, rv); - rv = appFile->GetParent(getter_AddRefs(confFile)); + rv = appFile->GetParent(getter_AddRefs(confDir)); NS_ENSURE_SUCCESS(rv, rv); - rv = confFile->AppendNative("fonts"_ns); - NS_ENSURE_SUCCESS(rv, rv); - rv = confFile->AppendNative("fonts.conf"_ns); + rv = confDir->AppendNative("fonts"_ns); NS_ENSURE_SUCCESS(rv, rv); nsAutoCString confPath; - rv = confFile->GetNativePath(confPath); - if (NS_WARN_IF(setenv("FONTCONFIG_FILE", confPath.BeginReading(), 1) != 0)) { + rv = confDir->GetNativePath(confPath); + NS_ENSURE_SUCCESS(rv, rv); + if (NS_WARN_IF(setenv("FONTCONFIG_PATH", confPath.BeginReading(), 1) != 0 || + setenv("FONTCONFIG_FILE", "fonts.conf", 1) != 0)) { return NS_ERROR_FAILURE; } return NS_OK; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c454273… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c454273… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-bundle-testsuite][main] 2 commits: Bug 40083: Use --force when running "git checkout main"
by morgan (＠morgan) 27 Nov '24

27 Nov '24

morgan pushed to branch main at The Tor Project / Applications / tor-browser-bundle-testsuite Commits: 02dde908 by Nicolas Vigier at 2024-11-27T12:45:12+01:00 Bug 40083: Use --force when running "git checkout main" - - - - - 1f3218f2 by Nicolas Vigier at 2024-11-27T18:59:22+01:00 Bug 40082: Add aarch64 Linux nightly builds for Tor and Mullvad Browser - - - - - 1 changed file: - TBBTestSuite/TestSuite/TorBrowserBuild.pm Changes: ===================================== TBBTestSuite/TestSuite/TorBrowserBuild.pm ===================================== @@ -68,6 +68,26 @@ sub set_tests { publish_dir => 'nightly-linux-i686', projectname => 'torbrowser', }, + { + name => 'torbrowser-nightly-linux-aarch64', + descr => 'build tor-browser nightly linux-aarch64', + type => 'rbm_build', + project => 'release', + targets => [ + 'noversiondir', + 'nightly', + 'browser-linux-aarch64', + 'torbrowser', + ], + publish_dir => 'nightly-linux-aarch64', + }, + { + name => 'torbrowser-incrementals-nightly-linux-aarch64', + descr => 'create incrementals for tor-browser nightly linux-aarch64', + type => 'make_incrementals', + publish_dir => 'nightly-linux-aarch64', + projectname => 'torbrowser', + }, { name => 'torbrowser-nightly-windows-i686', descr => 'build tor-browser nightly windows-i686', @@ -201,6 +221,26 @@ sub set_tests { publish_dir => 'mullvadbrowser-nightly-linux-x86_64', projectname => 'mullvadbrowser', }, + { + name => 'mullvadbrowser-nightly-linux-aarch64', + descr => 'build mullvad-browser nightly linux-aarch64', + type => 'rbm_build', + project => 'release', + targets => [ + 'noversiondir', + 'nightly', + 'browser-linux-aarch64', + 'mullvadbrowser', + ], + publish_dir => 'mullvadbrowser-nightly-linux-aarch64', + }, + { + name => 'mullvadbrowser-incrementals-nightly-linux-aarch64', + descr => 'create incrementals for mullvad-browser nightly linux-aarch64', + type => 'make_incrementals', + publish_dir => 'mullvadbrowser-nightly-linux-aarch64', + projectname => 'mullvadbrowser', + }, { name => 'mullvadbrowser-nightly-windows-x86_64', descr => 'build mullvad-browser nightly windows-x86_64', @@ -286,7 +326,7 @@ sub pre_tests { git_url => 'https://gitlab.torproject.org/tpo/applications/tor-browser-build.git', }); $gr->clone_fetch; - $gr->cmd('git', 'checkout', 'main'); + $gr->cmd('git', 'checkout', 'main', '--force'); chdir $gr->clone_dir(); copy($tbbinfos->{rbm_local_conf}, $gr->clone_dir() . '/rbm.local.conf') if $tbbinfos->{rbm_local_conf}; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.5] Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar
by morgan (＠morgan) 27 Nov '24

27 Nov '24

morgan pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build Commits: 0bad6cae by Nicolas Vigier at 2024-11-27T20:33:16+00:00 Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar - - - - - 1 changed file: - tools/dmg2mar Changes: ===================================== tools/dmg2mar ===================================== @@ -164,7 +164,7 @@ sub convert_files { (undef, $err, $success) = capture_exec('make_full_update.sh', '-q', $output, $appdir); exit_error "Error updating $output: $err" unless $success; - exit_error "make_full_update.sh failed. $output does not exist." + exit_error "make_full_update.sh failed. $output was not created.\n$err" unless -f $output; $pm->finish; } 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

[Git][tpo/applications/tor-browser-build][maint-14.0] Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar
by morgan (＠morgan) 27 Nov '24

27 Nov '24

morgan pushed to branch maint-14.0 at The Tor Project / Applications / tor-browser-build Commits: bb8c25be by Nicolas Vigier at 2024-11-27T20:32:49+00:00 Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar - - - - - 1 changed file: - tools/dmg2mar Changes: ===================================== tools/dmg2mar ===================================== @@ -165,7 +165,7 @@ sub convert_files { (undef, $err, $success) = capture_exec('make_full_update.sh', '-q', $output, $appdir); exit_error "Error updating $output: $err" unless $success; - exit_error "make_full_update.sh failed. $output does not exist." + exit_error "make_full_update.sh failed. $output was not created.\n$err" unless -f $output; $pm->finish; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar
by morgan (＠morgan) 27 Nov '24

27 Nov '24

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 55c24300 by Nicolas Vigier at 2024-11-27T17:57:04+01:00 Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar - - - - - 1 changed file: - tools/dmg2mar Changes: ===================================== tools/dmg2mar ===================================== @@ -165,7 +165,7 @@ sub convert_files { (undef, $err, $success) = capture_exec('make_full_update.sh', '-q', $output, $appdir); exit_error "Error updating $output: $err" unless $success; - exit_error "make_full_update.sh failed. $output does not exist." + exit_error "make_full_update.sh failed. $output was not created.\n$err" unless -f $output; $pm->finish; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41326: Remove var/torbrowser_legacy_version and var/torbrowser_legacy_platform_version
by boklm (＠boklm) 27 Nov '24

27 Nov '24

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: d21f57b2 by Nicolas Vigier at 2024-11-27T14:57:25+01:00 Bug 41326: Remove var/torbrowser_legacy_version and var/torbrowser_legacy_platform_version - - - - - 2 changed files: - projects/release/update_responses_config.yml - rbm.conf Changes: ===================================== projects/release/update_responses_config.yml ===================================== @@ -29,9 +29,6 @@ build_targets: channels: [% c('var/channel') %]: - [% c("var/torbrowser_version") %] -[% IF c("var/tor-browser") && c("var/torbrowser_legacy_version") -%] - - [% c("var/torbrowser_legacy_version") %] -[% END -%] versions: [% c("var/torbrowser_version") %]: [% IF c("var/create_unsigned_incrementals") -%] @@ -72,25 +69,6 @@ versions: minSupportedInstructionSet: SSE2 linux-x86_64: minSupportedInstructionSet: SSE2 -[% IF c("var/tor-browser") && c("var/torbrowser_legacy_version") -%] - [% c("var/torbrowser_legacy_version") %]: - mar_channel_id: [% c('var/mar_channel_id') %] - platformVersion: [% c('var/torbrowser_legacy_platform_version') %] - detailsURL: https://blog.torproject.org/new[% IF c("var/alpha") %]-alpha[% END %]-release-tor-browser-[% c("var/torbrowser_legacy_version") FILTER remove('\.') %] - # minSupportedOsVersion on macOS corresponds to the Darwin version ( https://en.wikipedia.org/wiki/Darwin_(operating_system) ) - macos: - # macOS v10.12.0 - minSupportedOSVersion: 16.0.0 - # minSupportedOsVersion on Windows corresponds to the operating system version ( https://docs.microsoft.com/en-us/windows/win32/sysinfo/operating-system-ver… ) - windows-i686: - # Windows 7 - minSupportedOSVersion: 6.1 - minSupportedInstructionSet: SSE2 - windows-x86_64: - # Windows 7 - minSupportedOSVersion: 6.1 - minSupportedInstructionSet: SSE2 -[% END -%] mar_compression: xz [% IF c("var/tor-browser") -%] tag: 'tbb-[% c("var/torbrowser_version") %]-[% c("var/torbrowser_build") %]' ===================================== rbm.conf ===================================== @@ -88,9 +88,6 @@ var: - '[% IF c("var/tor-browser") %]14.0a7[% END %]' mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' - torbrowser_legacy_version: 13.5a11 - torbrowser_legacy_platform_version: 115.16.0 - # By default, we sort the list of installed packages. This allows sharing # containers with identical list of packages, even if they are not listed # in the same order. In the cases where the installation order is View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser-update-responses][main] alpha: new version, 14.5a1
by ma1 (＠ma1) 27 Nov '24

27 Nov '24

ma1 pushed to branch main at The Tor Project / Applications / mullvad-browser-update-responses Commits: 69cdf276 by hackademix at 2024-11-27T17:07:10+01:00 alpha: new version, 14.5a1 - - - - - 29 changed files: - update_1/alpha/.htaccess - + update_1/alpha/14.0a10-14.5a1-linux-x86_64-ALL.xml - + update_1/alpha/14.0a10-14.5a1-macos-ALL.xml - + update_1/alpha/14.0a10-14.5a1-windows-x86_64-ALL.xml - − update_1/alpha/14.0a10-linux-x86_64-ALL.xml - − update_1/alpha/14.0a10-macos-ALL.xml - − update_1/alpha/14.0a10-windows-x86_64-ALL.xml - − update_1/alpha/14.0a7-14.0a10-linux-x86_64-ALL.xml - − update_1/alpha/14.0a7-14.0a10-macos-ALL.xml - − update_1/alpha/14.0a7-14.0a10-windows-x86_64-ALL.xml - − update_1/alpha/14.0a8-14.0a10-linux-x86_64-ALL.xml - − update_1/alpha/14.0a8-14.0a10-macos-ALL.xml - − update_1/alpha/14.0a8-14.0a10-windows-x86_64-ALL.xml - + update_1/alpha/14.0a8-14.5a1-linux-x86_64-ALL.xml - + update_1/alpha/14.0a8-14.5a1-macos-ALL.xml - + update_1/alpha/14.0a8-14.5a1-windows-x86_64-ALL.xml - − update_1/alpha/14.0a9-14.0a10-linux-x86_64-ALL.xml - − update_1/alpha/14.0a9-14.0a10-macos-ALL.xml - − update_1/alpha/14.0a9-14.0a10-windows-x86_64-ALL.xml - + update_1/alpha/14.0a9-14.5a1-linux-x86_64-ALL.xml - + update_1/alpha/14.0a9-14.5a1-macos-ALL.xml - + update_1/alpha/14.0a9-14.5a1-windows-x86_64-ALL.xml - + update_1/alpha/14.5a1-linux-x86_64-ALL.xml - + update_1/alpha/14.5a1-macos-ALL.xml - + update_1/alpha/14.5a1-windows-x86_64-ALL.xml - update_1/alpha/download-linux-x86_64.json - update_1/alpha/download-macos.json - update_1/alpha/download-windows-x86_64.json - update_1/alpha/downloads.json Changes: ===================================== update_1/alpha/.htaccess ===================================== @@ -1,22 +1,22 @@ RewriteEngine On -RewriteRule ^[^/]+/14.0a10/ no-update.xml [last] -RewriteRule ^Linux_x86_64-gcc3/14.0a7/ALL 14.0a7-14.0a10-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/14.0a8/ALL 14.0a8-14.0a10-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/14.0a9/ALL 14.0a9-14.0a10-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 14.0a10-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/ 14.0a10-linux-x86_64-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/14.0a7/ALL 14.0a7-14.0a10-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/14.0a8/ALL 14.0a8-14.0a10-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/14.0a9/ALL 14.0a9-14.0a10-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 14.0a10-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/ 14.0a10-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/14.0a7/ALL 14.0a7-14.0a10-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/14.0a8/ALL 14.0a8-14.0a10-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/14.0a9/ALL 14.0a9-14.0a10-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 14.0a10-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/ 14.0a10-macos-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/14.0a7/ALL 14.0a7-14.0a10-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/14.0a8/ALL 14.0a8-14.0a10-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/14.0a9/ALL 14.0a9-14.0a10-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 14.0a10-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/ 14.0a10-windows-x86_64-ALL.xml [last] +RewriteRule ^[^/]+/14.5a1/ no-update.xml [last] +RewriteRule ^Linux_x86_64-gcc3/14.0a10/ALL 14.0a10-14.5a1-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/14.0a8/ALL 14.0a8-14.5a1-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/14.0a9/ALL 14.0a9-14.5a1-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 14.5a1-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/ 14.5a1-linux-x86_64-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/14.0a10/ALL 14.0a10-14.5a1-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/14.0a8/ALL 14.0a8-14.5a1-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/14.0a9/ALL 14.0a9-14.5a1-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 14.5a1-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/ 14.5a1-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/14.0a10/ALL 14.0a10-14.5a1-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/14.0a8/ALL 14.0a8-14.5a1-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/14.0a9/ALL 14.0a9-14.5a1-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 14.5a1-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/ 14.5a1-macos-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/14.0a10/ALL 14.0a10-14.5a1-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/14.0a8/ALL 14.0a8-14.5a1-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/14.0a9/ALL 14.0a9-14.5a1-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 14.5a1-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/ 14.5a1-windows-x86_64-ALL.xml [last] ===================================== update_1/alpha/14.0a10-14.5a1-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64-14.5a1_…" size="114201508" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64--14.0a1…" size="10719344" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a10-14.5a1-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos-14.5a1_ALL.mar" size="129310766" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos--14.0a10-14.5a…" size="15200549" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a10-14.5a1-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64-14.5a…" size="97655960" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64--14.0…" size="11109032" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a10-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a10" appVersion="14.0a10" platformVersion="128.4.0" buildID="20241031194338" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-linux-x86_64-14.0a1…" size="114129405" type="complete"></patch></update></updates> ===================================== update_1/alpha/14.0a10-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a10" appVersion="14.0a10" platformVersion="128.4.0" buildID="20241031194338" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-macos-14.0a10_ALL.m…" size="129200778" type="complete"></patch></update></updates> ===================================== update_1/alpha/14.0a10-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a10" appVersion="14.0a10" platformVersion="128.4.0" buildID="20241031194338" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-windows-x86_64-14.0…" size="97553244" type="complete"></patch></update></updates> ===================================== update_1/alpha/14.0a7-14.0a10-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a10" appVersion="14.0a10" platformVersion="128.4.0" buildID="20241031194338" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-linux-x86_64-14.0a1…" size="114129405" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-linux-x86_64--14.0a…" size="10956214" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a7-14.0a10-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a10" appVersion="14.0a10" platformVersion="128.4.0" buildID="20241031194338" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-macos-14.0a10_ALL.m…" size="129200778" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-macos--14.0a7-14.0a…" size="16734321" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a7-14.0a10-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a10" appVersion="14.0a10" platformVersion="128.4.0" buildID="20241031194338" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-windows-x86_64-14.0…" size="97553244" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-windows-x86_64--14.…" size="15099219" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a8-14.0a10-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a10" appVersion="14.0a10" platformVersion="128.4.0" buildID="20241031194338" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-linux-x86_64-14.0a1…" size="114129405" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-linux-x86_64--14.0a…" size="8395504" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a8-14.0a10-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a10" appVersion="14.0a10" platformVersion="128.4.0" buildID="20241031194338" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-macos-14.0a10_ALL.m…" size="129200778" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-macos--14.0a8-14.0a…" size="14072348" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a8-14.0a10-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a10" appVersion="14.0a10" platformVersion="128.4.0" buildID="20241031194338" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-windows-x86_64-14.0…" size="97553244" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-windows-x86_64--14.…" size="12468369" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a8-14.5a1-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64-14.5a1_…" size="114201508" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64--14.0a8…" size="13246900" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a8-14.5a1-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos-14.5a1_ALL.mar" size="129310766" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos--14.0a8-14.5a1…" size="18726861" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a8-14.5a1-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64-14.5a…" size="97655960" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64--14.0…" size="17093460" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a9-14.0a10-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a10" appVersion="14.0a10" platformVersion="128.4.0" buildID="20241031194338" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-linux-x86_64-14.0a1…" size="114129405" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-linux-x86_64--14.0a…" size="8388128" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a9-14.0a10-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a10" appVersion="14.0a10" platformVersion="128.4.0" buildID="20241031194338" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-macos-14.0a10_ALL.m…" size="129200778" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-macos--14.0a9-14.0a…" size="14067444" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a9-14.0a10-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.0a10" appVersion="14.0a10" platformVersion="128.4.0" buildID="20241031194338" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.0a10" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-windows-x86_64-14.0…" size="97553244" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-windows-x86_64--14.…" size="12458073" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a9-14.5a1-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64-14.5a1_…" size="114201508" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64--14.0a9…" size="13241088" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a9-14.5a1-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos-14.5a1_ALL.mar" size="129310766" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos--14.0a9-14.5a1…" size="18706709" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a9-14.5a1-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64-14.5a…" size="97655960" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64--14.0…" size="17106048" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.5a1-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64-14.5a1_…" size="114201508" type="complete"></patch></update></updates> ===================================== update_1/alpha/14.5a1-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos-14.5a1_ALL.mar" size="129310766" type="complete"></patch></update></updates> ===================================== update_1/alpha/14.5a1-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64-14.5a…" size="97655960" type="complete"></patch></update></updates> ===================================== update_1/alpha/download-linux-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-linux-x86_64-14.0a1…","git_tag":"mb-14.0a10-build1","sig":"https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-linux-x86_64-14.0a1…","version":"14.0a10"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64-14.5a1.…","git_tag":"mb-14.5a1-build1","sig":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64-14.5a1.…","version":"14.5a1"} \ No newline at end of file ===================================== update_1/alpha/download-macos.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-macos-14.0a10.dmg","git_tag":"mb-14.0a10-build1","sig":"https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-macos-14.0a10.dmg.a…","version":"14.0a10"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos-14.5a1.dmg","git_tag":"mb-14.5a1-build1","sig":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos-14.5a1.dmg.asc","version":"14.5a1"} \ No newline at end of file ===================================== update_1/alpha/download-windows-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-windows-x86_64-14.0…","git_tag":"mb-14.0a10-build1","sig":"https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-windows-x86_64-14.0…","version":"14.0a10"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64-14.5a…","git_tag":"mb-14.5a1-build1","sig":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64-14.5a…","version":"14.5a1"} \ No newline at end of file ===================================== update_1/alpha/downloads.json ===================================== @@ -1 +1 @@ -{"downloads":{"linux-x86_64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-linux-x86_64-14.0a1…","sig":"https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-linux-x86_64-14.0a1…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-macos-14.0a10.dmg","sig":"https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-macos-14.0a10.dmg.a…"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-windows-x86_64-14.0…","sig":"https://cdn.mullvad.net/browser/14.0a10/mullvad-browser-windows-x86_64-14.0…"}}},"tag":"mb-14.0a10-build1","version":"14.0a10"} \ No newline at end of file +{"downloads":{"linux-x86_64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64-14.5a1.…","sig":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64-14.5a1.…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos-14.5a1.dmg","sig":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos-14.5a1.dmg.asc"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64-14.5a…","sig":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64-14.5a…"}}},"tag":"mb-14.5a1-build1","version":"14.5a1"} \ No newline at end of file View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] alpha: new version, 14.5a1
by ma1 (＠ma1) 27 Nov '24

27 Nov '24

ma1 pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 2d355005 by hackademix at 2024-11-27T14:55:41+01:00 alpha: new version, 14.5a1 - - - - - 30 changed files: - update_3/alpha/.htaccess - − update_3/alpha/13.5a10-14.0a9+13.5a11-linux-i686-ALL.xml - − update_3/alpha/13.5a10-14.0a9+13.5a11-linux-x86_64-ALL.xml - − update_3/alpha/13.5a10-14.0a9+13.5a11-macos-ALL.xml - − update_3/alpha/13.5a10-14.0a9+13.5a11-windows-i686-ALL.xml - − update_3/alpha/13.5a10-14.0a9+13.5a11-windows-x86_64-ALL.xml - − update_3/alpha/13.5a8-14.0a9+13.5a11-linux-i686-ALL.xml - − update_3/alpha/13.5a8-14.0a9+13.5a11-linux-x86_64-ALL.xml - − update_3/alpha/13.5a8-14.0a9+13.5a11-macos-ALL.xml - − update_3/alpha/13.5a8-14.0a9+13.5a11-windows-i686-ALL.xml - − update_3/alpha/13.5a8-14.0a9+13.5a11-windows-x86_64-ALL.xml - − update_3/alpha/13.5a9-14.0a9+13.5a11-linux-i686-ALL.xml - − update_3/alpha/13.5a9-14.0a9+13.5a11-linux-x86_64-ALL.xml - − update_3/alpha/13.5a9-14.0a9+13.5a11-macos-ALL.xml - − update_3/alpha/13.5a9-14.0a9+13.5a11-windows-i686-ALL.xml - − update_3/alpha/13.5a9-14.0a9+13.5a11-windows-x86_64-ALL.xml - − update_3/alpha/14.0a6-14.0a9+13.5a11-linux-i686-ALL.xml - − update_3/alpha/14.0a6-14.0a9+13.5a11-linux-x86_64-ALL.xml - − update_3/alpha/14.0a6-14.0a9+13.5a11-macos-ALL.xml - − update_3/alpha/14.0a6-14.0a9+13.5a11-windows-i686-ALL.xml - − update_3/alpha/14.0a6-14.0a9+13.5a11-windows-x86_64-ALL.xml - − update_3/alpha/14.0a7-14.0a9+13.5a11-linux-i686-ALL.xml - − update_3/alpha/14.0a7-14.0a9+13.5a11-linux-x86_64-ALL.xml - − update_3/alpha/14.0a7-14.0a9+13.5a11-macos-ALL.xml - − update_3/alpha/14.0a7-14.0a9+13.5a11-windows-i686-ALL.xml - − update_3/alpha/14.0a7-14.0a9+13.5a11-windows-x86_64-ALL.xml - + update_3/alpha/14.0a7-14.5a1-linux-i686-ALL.xml - + update_3/alpha/14.0a7-14.5a1-linux-x86_64-ALL.xml - + update_3/alpha/14.0a7-14.5a1-macos-ALL.xml - + update_3/alpha/14.0a7-14.5a1-windows-i686-ALL.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-14.0] Bug 41325: Exclude Applications symlink when extracting dmg file in dmg2mar
by boklm (＠boklm) 27 Nov '24

27 Nov '24

boklm pushed to branch maint-14.0 at The Tor Project / Applications / tor-browser-build Commits: 44e12497 by Nicolas Vigier at 2024-11-27T14:42:55+01:00 Bug 41325: Exclude Applications symlink when extracting dmg file in dmg2mar Recent versions of 7z fail to extract our dmg files since the `Applications` symlink points outside the archive: https://sourceforge.net/p/sevenzip/discussion/45797/thread/9f5b067368/?page… We exclude the `Applications` symlink to avoid the issue. We don't need it since it is not included in the mar file. - - - - - 1 changed file: - tools/dmg2mar Changes: ===================================== tools/dmg2mar ===================================== @@ -132,6 +132,7 @@ sub convert_files { $pm->start($step_name) and next; my $tmpdir = File::Temp->newdir(); my (undef, $err, $success) = capture_exec('7z', 'x', "-o$tmpdir", + '-x!*/Applications', $file->{filename}); exit_error "Error extracting $file->{filename}: $err" unless $success; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41325: Exclude Applications symlink when extracting dmg file in dmg2mar
by boklm (＠boklm) 27 Nov '24

27 Nov '24

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 516907ba by Nicolas Vigier at 2024-11-27T13:48:56+01:00 Bug 41325: Exclude Applications symlink when extracting dmg file in dmg2mar Recent versions of 7z fail to extract our dmg files since the `Applications` symlink points outside the archive: https://sourceforge.net/p/sevenzip/discussion/45797/thread/9f5b067368/?page… We exclude the `Applications` symlink to avoid the issue. We don't need it since it is not included in the mar file. - - - - - 1 changed file: - tools/dmg2mar Changes: ===================================== tools/dmg2mar ===================================== @@ -132,6 +132,7 @@ sub convert_files { $pm->start($step_name) and next; my $tmpdir = File::Temp->newdir(); my (undef, $err, $success) = capture_exec('7z', 'x', "-o$tmpdir", + '-x!*/Applications', $file->{filename}); exit_error "Error extracting $file->{filename}: $err" unless $success; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.5.0esr-14.5-1] fixup! MB 188: Customize Gitlab Issue and Merge templates
by morgan (＠morgan) 26 Nov '24

26 Nov '24

morgan pushed to branch mullvad-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: baa314e0 by Morgan at 2024-11-26T20:42:18+00:00 fixup! MB 188: Customize Gitlab Issue and Merge templates update Sign and Tag step to use the sign-tag script in tor-browser-build - - - - - 2 changed files: - .gitlab/issue_templates/Rebase Browser - Alpha.md - .gitlab/issue_templates/Rebase Browser - Stable.md Changes: ===================================== .gitlab/issue_templates/Rebase Browser - Alpha.md ===================================== @@ -78,6 +78,9 @@ ### **Sign and Tag** - [ ] Sign/Tag `HEAD` of the merged `mullvad-browser` branch: - - **Tag**: `mullvad-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1` - - **Message**: `Tagging build1 for $(ESR_VERSION)esr-based stable` - - [ ] Push tag to `upstream` + - In **mullvad-browser.git**, checkout the new alpha `mullvad-browser` branch + - In **tor-browser-build.git**, run signing script: + ```bash + ./tools/browser/sign-tag.mullvadbrowser alpha build1 + ``` + - [ ] Push tag to `upstream` \ No newline at end of file ===================================== .gitlab/issue_templates/Rebase Browser - Stable.md ===================================== @@ -79,6 +79,9 @@ ### **Sign and Tag** - [ ] Sign/Tag `HEAD` of the merged `mullvad-browser` branch: - - **Tag**: `mullvad-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1` - - **Message**: `Tagging build1 for $(ESR_VERSION)esr-based stable` + - In **mullvad-browser.git**, checkout the new stable `mullvad-browser` branch + - In **tor-browser-build.git**, run signing script: + ```bash + ./tools/browser/sign-tag.mullvadbrowser stable build1 + ``` - [ ] Push tag to `upstream` View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/baa… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/baa… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.5-1] fixup! Bug 41649: Create rebase and security backport gitlab issue templates
by morgan (＠morgan) 26 Nov '24

26 Nov '24

morgan pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: e4c970bb by Morgan at 2024-11-26T20:39:29+00:00 fixup! Bug 41649: Create rebase and security backport gitlab issue templates Add legacy rebase template and replace signing step with sign-tag script invocation in tor-browser-buildl - - - - - 3 changed files: - .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Legacy.md - .gitlab/issue_templates/Rebase Browser - Stable.md Changes: ===================================== .gitlab/issue_templates/Rebase Browser - Alpha.md ===================================== @@ -131,17 +131,23 @@ ### **Sign and Tag** - [ ] Sign/Tag `HEAD` of the merged `tor-browser` branch: - - **Tag**: `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1` - - **Message**: `Tagging build1 for $(ESR_VERSION)esr-based alpha` + - In **tor-browser.git**, checkout the new alpha `tor-browser` branch + - In **tor-browser-build.git**, run signing script: + ```bash + ./tools/browser/sign-tag.torbrowser alpha build1 + ``` - [ ] Push tag to `upstream` - [ ] Sign/Tag HEAD of the merged `base-browser` branch: - - **Tag**: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1` - - **Message**: `Tagging build1 for $(ESR_VERSION)esr-based alpha` + - In **tor-browser.git**, checkout the new alpha `base-browser` branch + - In **tor-browser-build.git**, run signing script: + ```bash + ./tools/browser/sign-tag.basebrowser alpha build1 + ``` - [ ] Push tag to `upstream` -- [ ] Update tor-browser-build's main (no MR required, you can just push it if you have the permissions) +- [ ] Update tor-browser-build's `main` branch (no MR required, you can just push it if you have the permissions) - [ ] Update `projects/firefox/config` - [ ] Update `firefox_platform_version` - [ ] Set `browser_build` to 1 (to prevent failures in alpha testbuilds) - [ ] Update `projects/geckoview/config` - - [ ] Update `geckoview_version` - - [ ] Set `browser_build` to 1 + - [ ] Update `firefox_platform_version` + - [ ] Set `browser_build` to 1 (to prevent failures in alpha testbuilds) ===================================== .gitlab/issue_templates/Rebase Browser - Legacy.md ===================================== @@ -0,0 +1,111 @@ +**NOTE:** All examples in this template reference the rebase from 115.17.0esr to 115.18.0esr + +<details> + <summary>Explanation of Variables</summary> + +- `$(ESR_VERSION)`: the Mozilla defined ESR version, used in various places for building tor-browser tags, labels, etc + - **Example**: `115.18.0` +- `$(ESR_TAG)`: the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)` + - **Example**: `FIREFOX_115_18_0esr_BUILD1` +- `$(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) + - **Example**: `FIREFOX_115_17_0esr_BUILD1` +- `$(BASE_BROWSER_BRANCH)`: the full name of the current `base-browser` branch + - **Example**: `base-browser-115.18.0esr-13.5-1` +- `$(BASE_BROWSER_BRANCH_PREV)`: the full name of the previous `base-browser` branch + - **Example**: `base-browser-115.17.0esr-13.5-1` +- `$(TOR_BROWSER_BRANCH)`: the full name of the current `tor-browser` branch + - **Example**: `tor-browser-115.18.0esr-13.5-1` +- `$(TOR_BROWSER_BRANCH_PREV)`: the full name of the previous `tor-browser` branch + - **Example**: `tor-browser-115.17.0esr-13.5-1` +</details> + +### **Bookkeeping** + +- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. + +### Update Branch Protection Rules + +- [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett…: + - [ ] Remove previous legacy `base-browser` and `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased) + - [ ] Create new `base-browser` and `tor-browser` branch protection rule: + - **Branch**: `*-$(ESR_VERSION)esr-13.5-1*` + - **Example**: `*-115.18.0esr-13.5-1*` + - **Allowed to merge**: `Maintainers` + - **Allowed to push and merge**: `Maintainers` + - **Allowed to force push**: `false` + +### **Identify the Firefox Tagged Commit and Create New Branches** + +- [ ] Find the Firefox mercurial tag here: https://hg.mozilla.org/releases/mozilla-esr102/tags + - **Example**: `FIREFOX_115_18_0esr_BUILD1` +- [ ] Find the analogous `gecko-dev` commit: https://github.com/mozilla/gecko-dev + - **Tip**: Search for unique string (like the Differential Revision ID) found in the mercurial commit in the `gecko-dev/esr115` branch to find the equivalent commit + - **Example**: `293d490d2e8d9fbb91c76336288f1287cbe285fb` +- [ ] Sign and Tag `gecko-dev` commit + - Sign/Tag `gecko-dev` commit : + - **Tag**: `$(ESR_TAG)` + - **Message**: `Hg tag $(ESR_TAG)` +- [ ] Create new legacy `base-browser` branch from tag + - Branch name in the form: `base-browser-$(ESR_VERSION)esr-13.5-1` + - **Example**: `base-browser-115.18.0esr-13.5-1` +- [ ] Create new legacy `tor-browser` branch from + - Branch name in the form: `tor-browser-$(ESR_VERSION)esr-13.5-1` + - **Example**: `tor-browser-115.18.0esr-13.5-1` +- [ ] Push new `base-browser` branch to `upstream` +- [ ] Push new `tor-browser` branch to `upstream` +- [ ] Push new `$(ESR_TAG)` to `upstream` + +### **Rebase tor-browser** + +- [ ] Checkout a new local branch for the `tor-browser` rebase + - **Example**: `git branch tor-browser-rebase FIREFOX_115_18_0esr_BUILD1` +- [ ] **(Optional)** `base-browser` rebase + - **NOTE** This step may be skipped if the `HEAD` of the previous `base-browser` branch is a `-buildN` tag + - [ ] Cherry-pick the previous `base-browser` commits up to `base-browser`'s `buildN` tag onto new `base-browser` rebase branch + - **Example**: `git cherry-pick FIREFOX_115_17_0esr_BUILD1..base-browser-115.17.0esr-13.5-1-build2` + - [ ] Rebase and autosquash these cherry-picked commits + - **Example**: `git rebase --autosquash --interactive FIREFOX_115_18_0esr_BUILD1 HEAD` + - [ ] Cherry-pick remainder of patches after the `buildN` tag + - **Example**: `git cherry-pick base-browser-115.17.0esr-13.5-1-build21..upstream/base-browser-115.17.0esr-13.5-1` +- [ ] `tor-browser` rebase + - [ ] Note the current git hash of `HEAD` for `tor-browser` rebase+autosquash step: `git rev-parse HEAD` + - [ ] Cherry-pick the appropriate previous `tor-browser` branch's commit range up to the last `tor-browser` `buildN` tag + - **Example**: `git cherry-pick base-browser-115.17.0esr-13.5-1-build1..tor-browser-115.17.0esr-13.5-1-build2 + - **Example (if separate base-browser rebase was skipped)**: `git cherry-pick FIREFOX_115_17_0esr_BUILD1..tor-browser-115.17.0esr-13.5-1-build2` + - [ ] Rebase and autosquash these newly cherry-picked commits: `git rebase --autosquash --interactive $(PREV_HEAD)` + - **Example**: `git rebase --autosquash --interactive FIREFOX_115_18_0esr_BUILD1` + - [ ] Cherry-pick remainder of patches after the last `tor-browser` `buildN` tag + - **Example**: `git cherry-pick tor-browser-115.17.0esr-13.5-1-build1..upstream/tor-browser-115.17.0esr-13.5-1` + - [ ] Rebase and autosquash again, this time replacing all `fixup` and `squash` commands with `pick`. The goal here is to have all of the `fixup` and `squash` commits beside the commit which they modify, but kept un-squashed for easy debugging/bisecting. + - **Example**: `git rebase --autosquash --interactive FIREFOX_115_18_0esr_BUILD1` +- [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution: + - [ ] diff of diffs: + - Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred difftool and look at differences on lines that starts with + or - + - `git diff $(ESR_TAG_PREV)..$(BROWSER_BRANCH_PREV) > current_patchset.diff` + - `git diff $(ESR_TAG)..$(BROWSER_BRANCH) > rebased_patchset.diff` + - diff `current_patchset.diff` and `rebased_patchset.diff` + - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` (unless the previous `base-browser` branch includes changes not included in the previous `tor-browser` branch) + - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD` + - **Example**: `git range-dif FIREFOX_115_17_0esr_BUILD1..upstream/tor-browser-115.17.0esr-13.5-1 FIREFOX_115_18_0esr_BUILD1..HEAD` +- [ ] Open MR for the `tor-browser` rebase +- [ ] Merge +- Update and push `base-browser` branch + - [ ] Reset the new `base-browser` branch to the appropriate commit in this new `tor-browser` branch + - [ ] Push these commits to `upstream` + +### **Sign and Tag** + +- [ ] Sign/Tag `HEAD` of the merged `tor-browser` branch: + - In **tor-browser.git**, checkout the new legacy `tor-browser` branch + - In **tor-browser-build.git**, run signing script: + ```bash + ./tools/browser/sign-tag.torbrowser legacy build1 + ``` + - [ ] Push tag to `upstream` +- [ ] Sign/Tag HEAD of the merged `base-browser` branch: + - In **tor-browser.git**, checkout the new legacy `base-browser` branch + - In **tor-browser-build.git**, run signing script: + ```bash + ./tools/browser/sign-tag.basebrowser legacy build1 + ``` + - [ ] Push tag to `upstream` ===================================== .gitlab/issue_templates/Rebase Browser - Stable.md ===================================== @@ -100,10 +100,16 @@ ### **Sign and Tag** - [ ] Sign/Tag `HEAD` of the merged `tor-browser` branch: - - **Tag**: `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1` - - **Message**: `Tagging build1 for $(ESR_VERSION)esr-based stable` + - In **tor-browser.git**, checkout the new stable `tor-browser` branch + - In **tor-browser-build.git**, run signing script: + ```bash + ./tools/browser/sign-tag.torbrowser stable build1 + ``` - [ ] Push tag to `upstream` - [ ] Sign/Tag HEAD of the merged `base-browser` branch: - - **Tag**: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1` - - **Message**: `Tagging build1 for $(ESR_VERSION)esr-based stable` + - In **tor-browser.git**, checkout the new stable `base-browser` branch + - In **tor-browser-build.git**, run signing script: + ```bash + ./tools/browser/sign-tag.basebrowser stable build1 + ``` - [ ] Push tag to `upstream` View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e4c970b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e4c970b… 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 merge request template
by morgan (＠morgan) 26 Nov '24

26 Nov '24

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 309b6ccb by Morgan at 2024-11-26T19:56:45+00:00 Update release prep merge request template No longer syncing chnagelogs between channels - - - - - 1 changed file: - .gitlab/merge_request_templates/relprep.md Changes: ===================================== .gitlab/merge_request_templates/relprep.md ===================================== @@ -39,7 +39,6 @@ - [ ] [Go](https://go.dev/dl): avoid major updates, unless planned - [ ] Manual version update (Tor Browser only, optional) - [ ] Changelogs - - [ ] Changelogs must be in sync between stable and alpha - [ ] Check the browser name - [ ] Check the version - [ ] Check the release date View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… You're receiving this email because of your account on gitlab.torproject.org.

1 0