- tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][maint-13.5] 4 commits: Bug 41314: Add tools/setup-martools and tools/mar
by morgan (＠morgan) 11 Feb '25

11 Feb '25

morgan pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build Commits: 01306970 by Nicolas Vigier at 2025-02-10T17:37:34+01:00 Bug 41314: Add tools/setup-martools and tools/mar tools/setup-martools will download and extract mar-tools to tools/local/mar-tools (if not already present). tools/mar will run mar after running tools/setup-martools. - - - - - ed149149 by Nicolas Vigier at 2025-02-10T17:50:53+01:00 Bug 41314: Use setup-martools in update_responses - - - - - 8626181d by Nicolas Vigier at 2025-02-10T17:51:32+01:00 Bug 41314: Update mar-tools version in projects/mar-tools/config - - - - - 6867368f by Nicolas Vigier at 2025-02-10T17:51:43+01:00 Bug 41314: Use setup-martools in dmg2mar - - - - - 8 changed files: - projects/mar-tools/config - tools/dmg2mar - + tools/mar - + tools/setup-martools - tools/signing/machines-setup/setup-signing-machine - tools/signing/machines-setup/upload-tbb-to-signing-machine - + tools/signmar - tools/update-responses/update_responses Changes: ===================================== projects/mar-tools/config ===================================== @@ -1,20 +1,22 @@ # vim: filetype=yaml sw=2 # # Used by tools/signing/machines-setup/upload-tbb-to-signing-machine -# to fetch mar-tools for signing machine setup +# to fetch mar-tools for signing machine setup, and by tools/setup-martools +# to allow running `mar` as `tools/mar`. # -version: 12.0.4 -filename: 'mar-tools-linux64.zip' +version: 14.0.4 +filename: 'mar-tools.zip' container: use_container: 0 gpg_keyring: torbrowser.gpg tag_gpg_id: 1 input_files: - - URL: 'https://archive.torproject.org/tor-package-archive/torbrowser/[% c("version") %]/mar-tools-linux64.zip' - sha256sum: 726ec4192de61a9342b3262c7ac722cbd59eaba07879be9589c65599d2d69584 + - URL: 'https://archive.torproject.org/tor-package-archive/torbrowser/[% c("version") %]/mar-tools-linux-x86_64-[% c("version") %].zip' + sha256sum: 414254d2471c7f0bcc25de955dbbe716c416d0b80e7688dc2dd48ac6e7fdbf0a steps: fetch_martools: fetch_martools: | #!/bin/bash - echo ok + mkdir -p '[% dest_dir %]' + cp -f mar-tools-linux-x86_64-[% c("version") %].zip '[% dest_dir %]/mar-tools.zip' ===================================== tools/dmg2mar ===================================== @@ -34,6 +34,7 @@ use File::Slurp; use File::Find; use Parallel::ForkManager; use Cwd; +use FindBin; # If the application is not TorBrowser (for instance, TorMessenger) # set the application name in the TOR_APPNAME_BUNDLE_OSX, @@ -70,25 +71,18 @@ sub osname { exit_error 'Unknown OS'; } -my $martools_tmpdir; -sub extract_martools { - my $osname = osname; - my $marzip = glob(getcwd . "/mar-tools-$osname-*.zip"); - exit_error "Could not find mar-tools zip" unless $marzip; - $martools_tmpdir = File::Temp->newdir(); - my $old_cwd = getcwd; - chdir $martools_tmpdir; - my (undef, undef, $success) = capture_exec('unzip', $marzip); - chdir $old_cwd; - exit_error "Error extracting $marzip" unless $success; - $ENV{PATH} = "$martools_tmpdir/mar-tools:$ENV{PATH}"; - if ($ENV{LD_LIBRARY_PATH}) { - $ENV{LD_LIBRARY_PATH} .= ":$martools_tmpdir/mar-tools"; - } else { - $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; - } - $ENV{MAR} = "$martools_tmpdir/mar-tools/mar"; - $ENV{MSBDIFF} = "$martools_tmpdir/mar-tools/mbsdiff"; +sub setup_martools { + my ($out, $err, $exit) = capture { + system("$FindBin::Bin/setup-martools"); + }; + exit_error "Error setting up mar-tools: $err" if $exit; + my $martoolsdir = "$FindBin::Bin/local/mar-tools"; + if ($ENV{LD_LIBRARY_PATH}) { + $ENV{LD_LIBRARY_PATH} = "$ENV{LD_LIBRARY_PATH}:$martoolsdir"; + } else { + $ENV{LD_LIBRARY_PATH} = "$martoolsdir/mar-tools"; + } + $ENV{PATH} = "$martoolsdir:$ENV{PATH}"; } sub get_nbprocs { @@ -192,6 +186,6 @@ $ENV{LC_ALL} = 'C'; exit_error "Please specify the mar channel id" unless @ARGV == 1; my $mar_channel_id = $ARGV[0]; -extract_martools; +setup_martools; convert_files $mar_channel_id; remove_incremental_mars; ===================================== tools/mar ===================================== @@ -0,0 +1,8 @@ +#!/bin/bash +set -e + +script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +cmdname=$(basename -- "${BASH_SOURCE[0]}") +setupmt=$("$script_dir/setup-martools") +eval "$setupmt" +exec "$MARTOOLSDIR/$cmdname" "$@" ===================================== tools/setup-martools ===================================== @@ -0,0 +1,49 @@ +#!/bin/bash +set -e + +script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +localdir="$script_dir/local" +test $# -eq 1 && localdir="$1" + +cd "$script_dir/.." + +function download_extract_martools { + make submodule-update > /dev/null + martools_version=$(./rbm/rbm showconf --step fetch_martools mar-tools version) + if test -h "$localdir/mar-tools"; then + test "$(readlink $localdir/mar-tools)" = "mar-tools-$martools_version" && return 0 + rm -f "$localdir/mar-tools" + fi + if test -d "$localdir/mar-tools"; then + echo "Error: $localdir/mar-tools already exists and is not a symlink" + exit 1 + fi + echo "Setting up mar-tools" + mkdir -p "$localdir" + cd "$localdir" + if ! test -d "mar-tools-$martools_version"; then + cd "$script_dir/.." + ./rbm/rbm build --step fetch_martools mar-tools + martools_zip="$(pwd)/out/mar-tools/mar-tools.zip" + cd "$localdir" + test -f "$martools_zip" + unzip -jd "mar-tools-$martools_version" "$martools_zip" + fi + ln -sf "mar-tools-$martools_version" mar-tools + echo "mar-tools have been set up in $localdir/mar-tools" +} + +function print_martools_vars { + mardir="$localdir/mar-tools" + if test -z "$LD_LIBRARY_PATH"; then + echo "export LD_LIBRARY_PATH=$mardir" + else + echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$mardir" + fi + echo "export MARTOOLSDIR=$mardir" + echo "export MAR=$mardir/mar" +} + +download_extract_martools >&2 +print_martools_vars ===================================== tools/signing/machines-setup/setup-signing-machine ===================================== @@ -137,7 +137,7 @@ fi # install mar-tools if ! test -d /home/signing-mar/mar-tools; then tmpdir=$(mktemp -d) - unzip -d "$tmpdir" /signing/mar-tools-linux64.zip + unzip -d "$tmpdir" /signing/mar-tools.zip chown -R signing-mar:signing-mar "$tmpdir/mar-tools" chmod go+rX "$tmpdir/mar-tools"/* mv "$tmpdir/mar-tools" /home/signing-mar/mar-tools ===================================== tools/signing/machines-setup/upload-tbb-to-signing-machine ===================================== @@ -25,7 +25,7 @@ git archive --prefix=rbm/ --output="$tmpdir/rbm.tar" HEAD . echo "Created rbm.tar" cd .. -martools_filename=mar-tools-linux64.zip +martools_filename=mar-tools.zip if ! test -f "./out/mar-tools/$martools_filename"; then ./rbm/rbm build --step fetch_martools mar-tools echo "Downloaded $martools_filename" ===================================== tools/signmar ===================================== @@ -0,0 +1 @@ +mar \ No newline at end of file ===================================== tools/update-responses/update_responses ===================================== @@ -33,8 +33,6 @@ my %htdocsfiles; my $releases_dir = $config->{releases_dir}; $releases_dir = "$FindBin::Bin/$releases_dir" unless $releases_dir =~ m/^\//; my @check_errors; -my $initPATH = $ENV{PATH}; -my $initLD_LIBRARY_PATH = $ENV{LD_LIBRARY_PATH}; sub exit_error { print STDERR "Error: ", $_[0], "\n"; @@ -63,6 +61,20 @@ sub get_nbprocs { return 4; } +sub setup_martools { + my ($out, $err, $exit) = capture { + system("$FindBin::Bin/../setup-martools"); + }; + exit_error "Error setting up mar-tools: $err" if $exit; + my $martoolsdir = "$FindBin::Bin/../local/mar-tools"; + if ($ENV{LD_LIBRARY_PATH}) { + $ENV{LD_LIBRARY_PATH} = "$ENV{LD_LIBRARY_PATH}:$martoolsdir"; + } else { + $ENV{LD_LIBRARY_PATH} = "$martoolsdir/mar-tools"; + } + $ENV{PATH} = "$martoolsdir:$ENV{PATH}"; +} + sub write_htdocs { my ($channel, $file, $content) = @_; mkdir $htdocsdir unless -d $htdocsdir; @@ -320,7 +332,7 @@ sub channel_to_version { sub get_buildinfos { my ($config, $version) = @_; return if exists $config->{versions}{$version}{buildID}; - extract_martools($config, $version); + setup_martools; my $files = $config->{versions}{$version}{files}; foreach my $os (keys %$files) { foreach my $lang (keys %{$files->{$os}}) { @@ -474,37 +486,6 @@ sub write_downloads_json { } } -sub marzip_path { - my ($config, $version) = @_; - for my $osname (qw/linux-x86_64 linux-i686 macos-x86_64 windows-x86_64 windows-i686/) { - my $marzip = glob(version_dir($config, $version) . "/mar-tools-$osname-*.zip"); - if ($marzip && -f $marzip) { - return $marzip; - } - } - exit_error 'Could not find mar-tools'; -} - -my $martools_tmpdir; -sub extract_martools { - my ($config, $version) = @_; - my $marzip = marzip_path($config, $version); - $martools_tmpdir = get_tmpdir($config); - my $old_cwd = getcwd; - chdir $martools_tmpdir; - my (undef, undef, $exit) = capture { - system('unzip', $marzip); - }; - chdir $old_cwd; - exit_error "Error extracting $marzip" if $exit; - $ENV{PATH} = "$martools_tmpdir/mar-tools:$initPATH"; - if ($initLD_LIBRARY_PATH) { - $ENV{LD_LIBRARY_PATH} = "$initLD_LIBRARY_PATH:$martools_tmpdir/mar-tools"; - } else { - $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; - } -} - sub log_step { my ($url, $step, $status, $details) = @_; state $u; @@ -673,9 +654,9 @@ my %actions = ( }, gen_incrementals => sub { my ($config) = @_; + setup_martools; foreach my $channel (@ARGV) { my ($version) = channel_to_version($config, $channel); - extract_martools($config, $version); get_version_files($config, $version); create_incremental_mars_for_version($config, $version, $channel); } 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][tor-browser-128.7.0esr-14.5-1] TB 42669: [android] Use custom no-op app-services
by Pier Angelo Vendrame (＠pierov) 11 Feb '25

11 Feb '25

Pier Angelo Vendrame pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 86b24fa4 by Beatriz Rizental at 2025-02-11T11:21:27+01:00 TB 42669: [android] Use custom no-op app-services Fetch the custom built no-op application services library from tor-browser-build when building for Android. - - - - - 12 changed files: - .gitignore - build.gradle - mobile/android/android-components/components/browser/engine-gecko/build.gradle - mobile/android/android-components/components/browser/storage-sync/src/main/java/mozilla/components/browser/storage/sync/Types.kt - mobile/android/android-components/components/feature/fxsuggest/build.gradle - mobile/android/android-components/components/service/firefox-accounts/src/main/java/mozilla/components/service/fxa/Types.kt - mobile/android/android-components/components/service/firefox-accounts/src/main/java/mozilla/components/service/fxa/sync/WorkManagerSyncManager.kt - mobile/android/android-components/components/service/nimbus/build.gradle - mobile/android/android-components/components/support/rustlog/src/main/java/mozilla/components/support/rustlog/RustLog.kt - mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt - mobile/android/fenix/tools/tba-fetch-deps.sh - tools/geckoview/build-fenix.sh Changes: ===================================== .gitignore ===================================== @@ -359,6 +359,7 @@ media/libvpx/config/**/config.log mobile/android/.experimenter.json # Tor libraries for local builds +mobile/android/fenix/app/nimbus-fml mobile/android/fenix/app/tor-expert-bundle.aar mobile/android/fenix/app/src/main/assets/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi ===================================== build.gradle ===================================== @@ -4,6 +4,8 @@ import org.tomlj.TomlTable buildscript { repositories { + mavenLocal() + gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository -> maven { url repository @@ -136,6 +138,8 @@ allprojects { } repositories { + mavenLocal() + gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository -> maven { url repository ===================================== mobile/android/android-components/components/browser/engine-gecko/build.gradle ===================================== @@ -4,6 +4,8 @@ buildscript { repositories { + mavenLocal() + gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository -> maven { url repository ===================================== mobile/android/android-components/components/browser/storage-sync/src/main/java/mozilla/components/browser/storage/sync/Types.kt ===================================== @@ -71,6 +71,7 @@ internal fun mozilla.appservices.places.uniffi.VisitType.into() = when (this) { mozilla.appservices.places.uniffi.VisitType.REDIRECT_TEMPORARY -> VisitType.REDIRECT_TEMPORARY mozilla.appservices.places.uniffi.VisitType.DOWNLOAD -> VisitType.DOWNLOAD mozilla.appservices.places.uniffi.VisitType.FRAMED_LINK -> VisitType.FRAMED_LINK + mozilla.appservices.places.uniffi.VisitType.__NOOP -> VisitType.LINK } internal fun mozilla.appservices.places.uniffi.HistoryVisitInfo.into(): VisitInfo { @@ -129,6 +130,18 @@ internal fun BookmarkItem.asBookmarkNode(): BookmarkNode { null, ) } + is BookmarkItem.__NOOP -> { + BookmarkNode( + BookmarkNodeType.ITEM, + "", + "", + null, + null, + null, + 0L, + null, + ) + } } } @@ -152,6 +165,7 @@ internal fun mozilla.appservices.places.uniffi.DocumentType.into(): DocumentType return when (this) { mozilla.appservices.places.uniffi.DocumentType.REGULAR -> DocumentType.Regular mozilla.appservices.places.uniffi.DocumentType.MEDIA -> DocumentType.Media + mozilla.appservices.places.uniffi.DocumentType.__NOOP -> DocumentType.Regular } } ===================================== mobile/android/android-components/components/feature/fxsuggest/build.gradle ===================================== @@ -6,6 +6,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile buildscript { repositories { + mavenLocal() + maven { url "https://maven.mozilla.org/maven2" } ===================================== mobile/android/android-components/components/service/firefox-accounts/src/main/java/mozilla/components/service/fxa/Types.kt ===================================== @@ -128,7 +128,7 @@ internal fun RustDeviceType.into(): DeviceType { RustDeviceType.TABLET -> DeviceType.TABLET RustDeviceType.TV -> DeviceType.TV RustDeviceType.VR -> DeviceType.VR - RustDeviceType.UNKNOWN -> DeviceType.UNKNOWN + else-> DeviceType.UNKNOWN } } @@ -165,7 +165,7 @@ fun DeviceCapability.into(): RustDeviceCapability { fun RustDeviceCapability.into(): DeviceCapability { return when (this) { RustDeviceCapability.SEND_TAB -> DeviceCapability.SEND_TAB - RustDeviceCapability.CLOSE_TABS -> DeviceCapability.CLOSE_TABS + else -> DeviceCapability.CLOSE_TABS } } @@ -250,7 +250,7 @@ fun AccountEvent.into(): mozilla.components.concept.sync.AccountEvent { deviceId = this.deviceId, isLocalDevice = this.isLocalDevice, ) - is AccountEvent.Unknown -> mozilla.components.concept.sync.AccountEvent.Unknown + else -> mozilla.components.concept.sync.AccountEvent.Unknown } } @@ -258,6 +258,7 @@ fun IncomingDeviceCommand.into(): mozilla.components.concept.sync.DeviceCommandI return when (this) { is IncomingDeviceCommand.TabReceived -> this.into() is IncomingDeviceCommand.TabsClosed -> this.into() + is IncomingDeviceCommand.__NOOP -> this.into() } } ===================================== mobile/android/android-components/components/service/firefox-accounts/src/main/java/mozilla/components/service/fxa/sync/WorkManagerSyncManager.kt ===================================== @@ -484,6 +484,9 @@ internal class WorkManagerSyncWorker( // Finally, declare success, failure or request a retry based on 'sync status'. return when (syncResult.status) { + ServiceStatus.__NOOP -> { + Result.success() + } // Happy case. ServiceStatus.OK -> { // Worker should set the "last-synced" timestamp, and since we have a single timestamp, ===================================== mobile/android/android-components/components/service/nimbus/build.gradle ===================================== @@ -4,6 +4,8 @@ buildscript { repositories { + mavenLocal() + gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository -> maven { url repository ===================================== mobile/android/android-components/components/support/rustlog/src/main/java/mozilla/components/support/rustlog/RustLog.kt ===================================== @@ -86,6 +86,6 @@ internal fun Level.asLogPriority(): Log.Priority { Level.DEBUG -> Log.Priority.DEBUG Level.INFO -> Log.Priority.INFO Level.WARN -> Log.Priority.WARN - Level.ERROR -> Log.Priority.ERROR + else -> Log.Priority.ERROR } } ===================================== mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt ===================================== @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // These lines are generated by android-components/automation/application-services-nightly-bump.py -val VERSION = "128.0.1" +val VERSION = "128.0.1-TORBROWSER" val CHANNEL = ApplicationServicesChannel.RELEASE object ApplicationServicesConfig { ===================================== mobile/android/fenix/tools/tba-fetch-deps.sh ===================================== @@ -19,3 +19,65 @@ mkdir -p "app/src/main/assets/extensions" if [ -f "$noscript" ]; then cp "$noscript" "app/src/main/assets/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" fi + +if [ -z "$GRADLE_MAVEN_REPOSITORIES" ]; then + GRADLE_MAVEN_REPOSITORIES="$HOME/.m2/repository" +fi + +os="$(uname -s)" +case "${os}" in + Linux*) os=unknown-linux;; + Darwin*) os=apple-darwin;; + # This is not quite correct, however the only option for the nimbus-fml + # build are these three... so if it's not Linux or Darwin it's very likely + # we are building from Windows. I apologize in advance to all the BSD users. + *) os="pc-windows";; +esac + +arch="$(uname -m)" +case "${arch}" in + # Also no quite correct, but again these are the only options for nimbus-fml. + aarch64) arch=aarch64;; + arm64) arch=aarch64;; + *) arch="x86_64";; +esac + +if [ "$os" = "unsupported" ] || [ "$arch" = "unsupported" ]; then + echo "Android builds from $os-$arch are not supported." + exit 2 +fi + +app_services="$(find "$TOR_BROWSER_BUILD/out/application-services" -name 'application-services*.tar.zst' -print | sort | tail -1)" +mkdir -p "$GRADLE_MAVEN_REPOSITORIES/org/mozilla" +if [ -f "$app_services" ]; then + tar -C /tmp -xf "$app_services" + cp -r /tmp/application-services/maven/org/mozilla/* "$GRADLE_MAVEN_REPOSITORIES/org/mozilla" + + # Over on tor-browser-build all build tools are built for x86_64-linux. + # If we are not building from that platform, we need to fetch the correct + # nimbus-fml binary. + # + # Even though we do modify nimbus-fml in tbb, all the changes are made to + # support reproducibility and are not necessary for development builds. + if [ "$os" != "unknown-linux" ] || [ "$arch" != "x86_64" ]; then + echo "Downloading nimbus-fml binary for $arch-$os" + app_services_version=$(echo "$app_services" | grep -oE 'application-services-[0-9]+\.[0-9]+\.[0-9]+' | grep -oE '[0-9]+\.[0-9]+\.[0-9]+') + + curl -L -o /tmp/nimbus-fml.zip "https://archive.mozilla.org/pub/app-services/releases/$app_services_version…" + unzip -d /tmp/nimbus-fml /tmp/nimbus-fml.zip + nimbus_fml="$(find "/tmp/nimbus-fml/" -name 'nimbus-fml*' | grep "$arch-$os")" + echo "Using nimbus-fml binary: $nimbus_fml" + cp $nimbus_fml app/ + + rm -rf /tmp/nimbus-fml + rm /tmp/nimbus-fml.zip + else + cp /tmp/application-services/nimbus-fml app/ + fi + chmod +x app/nimbus-fml + + rm -rf /tmp/application-services +else + echo "Cannot find application-services artifacts!" + exit 2 +fi ===================================== tools/geckoview/build-fenix.sh ===================================== @@ -6,6 +6,8 @@ VARIANT=$3 source android-env.sh +export NIMBUS_FML=$DEV_ROOT/mobile/android/fenix/app/nimbus-fml + 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 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/86b24fa… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/86b24fa… 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 42669: [Part 1] Add uniffi-rs project
by Pier Angelo Vendrame (＠pierov) 11 Feb '25

11 Feb '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: f701f1df by Beatriz Rizental at 2025-02-11T11:55:20+01:00 Bug 42669: [Part 1] Add uniffi-rs project Apps team forks uniffi and applies a patch to make the Kotlin bindings no-op. - - - - - 9345a6ea by Beatriz Rizental at 2025-02-11T14:31:15+01:00 Bug 42669: [Part 2] Use custom uniffi-rs in application-services The apps team custom uniffi-rs implementation removes the dependecy on application-services Rust libraries. Therefore, this commit also include changes to skip building and including these libs (aka libmegazord) in the final Android application. - - - - - 15 changed files: - Makefile - projects/application-services/README.md - + projects/application-services/a-s-noop.diff - − projects/application-services/apply-bug-13028.diff - projects/application-services/bug40485.diff → projects/application-services/bug40485-nimbus-fml-reproducibility.diff - − projects/application-services/bug_13028.patch - projects/application-services/build - + projects/application-services/cargo-no-build.sh - projects/application-services/config - + projects/application-services/glean-noop.diff - projects/application-services/list_toolchain_updates_checks - − projects/application-services/no-ndk-lookup.diff - + projects/uniffi-rs/build - + projects/uniffi-rs/config - rbm.conf Changes: ===================================== Makefile ===================================== @@ -669,6 +669,9 @@ cargo_vendor-wasm-bindgen: submodule-update cargo_vendor-lox: submodule-update $(rbm) build lox-wasm --step cargo_vendor --target alpha --target torbrowser-linux-x86_64 +cargo_vendor-uniffi-rs: submodule-update + $(rbm) build uniffi-rs --step cargo_vendor --target alpha --target torbrowser-linux-x86_64 + go_vendor-snowflake: submodule-update $(rbm) build snowflake --step go_vendor --target alpha --target torbrowser-linux-x86_64 ===================================== projects/application-services/README.md ===================================== @@ -1,6 +1,13 @@ Application Services is a collection of Rust components to enable integration with Mozilla online services, such as the Mozilla account, sync, etc... +Since all of the application-services features are disabled by the Tor Project browsers, +we don't build or include these Rust libraries in them. Even though these libraries +are written in Rust, they are consumed by Kotlin. Application Services uses uniffi +to auto-generate the Kotlin code that communicates with Rust. We have developed a +custom generator for uniffi (see `projects/uniffi-rs`) to generate no-op bindings, +i.e., bindings that don't call the Rust code and are therefore a dead-end. + We do not fork this project, because we apply a minimal set of patches mainly needed for offline builds. @@ -13,8 +20,12 @@ References: ## Vendored Rust dependencies -Application Services is written mainly in Rust and it mnanages external +Application Services is written mainly in Rust and it manages external dependencies through cargo. + +Although most Rust libraries aren't built by this project, the `nimbus-fml` +project -- a command line tool used by other projects -- is still built. + Reproduciblity is guaranteed by the provided `Cargo.lock`. We run offline builds, so we create the dependency archive in a separate step @@ -35,16 +46,6 @@ We keep the list of files to download in `gradle-dependencies-list.txt`. A procedure to create this file is documented in [tor-browser-build#40855](https://gitlab.torproject.org/tpo/applications/tor…. -## Other dependencies - -Finally, Application Services depends on two C libraries: -[NSS](https://firefox-source-docs.mozilla.org/security/nss/index.html) and -[SQLCipher](https://www.zetetic.net/sqlcipher/). -We used to have separate tor-browser-build projects for them, but they were -almost an exact copy of the scripts included in this repository. -Keeping them updated wasn't trivial, so we decided to run Mozilla's scripts -instead. - # Caveats ## Git repository information ===================================== projects/application-services/a-s-noop.diff ===================================== @@ -0,0 +1,61 @@ +diff --git a/components/fxa-client/android/src/main/java/mozilla/appservices/fxaclient/Config.kt b/components/fxa-client/android/src/main/java/mozilla/appservices/fxaclient/Config.kt +index 78c16dd0..d2615fa7 100644 +--- a/components/fxa-client/android/src/main/java/mozilla/appservices/fxaclient/Config.kt ++++ b/components/fxa-client/android/src/main/java/mozilla/appservices/fxaclient/Config.kt +@@ -13,4 +13,5 @@ fun FxaServer.contentUrl() = when (this) { + is FxaServer.China -> "https://accounts.firefox.com.cn" + is FxaServer.LocalDev -> "http://127.0.0.1:3030" + is FxaServer.Custom -> this.url ++ is FxaServer.__NOOP -> "" + } +diff --git a/components/nimbus/android/src/main/java/org/mozilla/experiments/nimbus/Nimbus.kt b/components/nimbus/android/src/main/java/org/mozilla/experiments/nimbus/Nimbus.kt +index 8c05be9c..6bf2ec15 100644 +--- a/components/nimbus/android/src/main/java/org/mozilla/experiments/nimbus/Nimbus.kt ++++ b/components/nimbus/android/src/main/java/org/mozilla/experiments/nimbus/Nimbus.kt +@@ -532,6 +532,8 @@ open class Nimbus( + ), + ) + } ++ ++ EnrollmentChangeEventType.__NOOP -> {} + } + } + } +diff --git a/components/places/android/src/main/java/mozilla/appservices/places/PlacesConnection.kt b/components/places/android/src/main/java/mozilla/appservices/places/PlacesConnection.kt +index 282f4e90..db8b00a3 100644 +--- a/components/places/android/src/main/java/mozilla/appservices/places/PlacesConnection.kt ++++ b/components/places/android/src/main/java/mozilla/appservices/places/PlacesConnection.kt +@@ -289,6 +289,7 @@ internal fun VisitType.toInt(): Int { + VisitType.FRAMED_LINK -> 8 + VisitType.RELOAD -> 9 + VisitType.UPDATE_PLACE -> 10 ++ VisitType.__NOOP -> -1 + } + } + +diff --git a/megazords/full/android/build.gradle b/megazords/full/android/build.gradle +index 822ce180..ccdc6c8a 100644 +--- a/megazords/full/android/build.gradle ++++ b/megazords/full/android/build.gradle +@@ -54,6 +54,8 @@ configurations { + } + + cargo { ++ cargoCommand = "${rootDir}/megazords/full/android/cargo-no-build.sh" ++ + // The directory of the Cargo.toml to build. + module = '..' + +diff --git a/publish.gradle b/publish.gradle +index 71f5d55b..027665ff 100644 +--- a/publish.gradle ++++ b/publish.gradle +@@ -194,7 +194,7 @@ ext.configureUniFFIBindgen = { udlFilePath -> + def uniffiGeneratedPath = "generated/source/uniffi/${variant.name}/java" + def t = tasks.register("generate${variant.name.capitalize()}UniFFIBindings", Exec) { + workingDir project.rootDir +- commandLine '/usr/bin/env', 'cargo', 'uniffi-bindgen', 'generate', "${project.projectDir}/${udlFilePath}", '--language', 'kotlin', '--out-dir', "${buildDir}/${uniffiGeneratedPath}" ++ commandLine '/usr/bin/env', "${rootProject.projectDir}/uniffi-rs/uniffi-bindgen", 'generate', "${project.projectDir}/${udlFilePath}", '--language', 'kotlin', '--out-dir', "${buildDir}/${uniffiGeneratedPath}" + outputs.dir "${buildDir}/${uniffiGeneratedPath}" + // Re-generate if the interface definition changes. + inputs.file "${project.projectDir}/${udlFilePath}" ===================================== projects/application-services/apply-bug-13028.diff deleted ===================================== @@ -1,20 +0,0 @@ -diff --git a/libs/build-all.sh b/libs/build-all.sh -index 650c1299..6c4e5404 100755 ---- a/libs/build-all.sh -+++ b/libs/build-all.sh -@@ -128,6 +128,15 @@ echo $'\ - fi - ' | patch "${NSS_SRC_PATH}/nspr/configure" - -+rm -f python -+ln -s /usr/bin/python3 python -+export PATH=$(pwd):$PATH -+patch_13028=$(realpath bug_13028.patch) -+pushd $NSS_SRC_PATH -+# Apply our proxy bypass defense-in-depth here as well to be on the safe side. -+patch -p2 < $patch_13028 -+popd -+ - if [[ "${PLATFORM}" == "ios" ]] - then - ./build-all-ios.sh "${SQLCIPHER_SRC_PATH}" "${NSS_SRC_PATH}" ===================================== projects/application-services/bug40485.diff → projects/application-services/bug40485-nimbus-fml-reproducibility.diff ===================================== @@ -4,16 +4,16 @@ index 97d545672..249406a0c 100644 +++ b/components/support/nimbus-fml/src/intermediate_representation.rs @@ -237,10 +237,10 @@ pub struct FeatureManifest { pub(crate) about: AboutBlock, - + #[serde(default)] - pub(crate) imported_features: HashMap<ModuleId, BTreeSet<String>>, + pub(crate) imported_features: BTreeMap<ModuleId, BTreeSet<String>>, - + #[serde(default)] - pub(crate) all_imports: HashMap<ModuleId, FeatureManifest>, + pub(crate) all_imports: BTreeMap<ModuleId, FeatureManifest>, } - + impl TypeFinder for FeatureManifest { diff --git a/components/support/nimbus-fml/src/parser.rs b/components/support/nimbus-fml/src/parser.rs index 49cace525..cdf692b86 100644 @@ -34,7 +34,7 @@ index 49cace525..cdf692b86 100644 // We associate only the feature ids with the manifest we're loading in this method. - let mut imported_feature_id_map = HashMap::new(); + let mut imported_feature_id_map = BTreeMap::new(); - + for block in &frontend.imports { // 1. Load the imported manifests in to the hash map. @@ -328,7 +328,7 @@ impl Parser { ===================================== projects/application-services/bug_13028.patch deleted ===================================== @@ -1,79 +0,0 @@ -From 2f0888c348561249d3083555db33c5619840dbfa Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)torproject.org> -Date: Mon, 29 Sep 2014 14:30:19 -0700 -Subject: [PATCH] Bug 13028: Prevent potential proxy bypass cases. - -It looks like these cases should only be invoked in the NSS command line -tools, and not the browser, but I decided to patch them anyway because there -literally is a maze of network function pointers being passed around, and it's -very hard to tell if some random code might not pass in the proper proxied -versions of the networking code here by accident. - -diff --git a/security/nss/lib/certhigh/ocsp.c b/security/nss/lib/certhigh/ocsp.c -index cea8456606bf..86fa971cfbef 100644 ---- a/security/nss/lib/certhigh/ocsp.c -+++ b/security/nss/lib/certhigh/ocsp.c -@@ -2932,6 +2932,14 @@ ocsp_ConnectToHost(const char *host, PRUint16 port) - PRNetAddr addr; - char *netdbbuf = NULL; - -+ // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but -+ // we want to ensure nothing can ever hit this code in production. -+#if 1 -+ printf("Tor Browser BUG: Attempted OSCP direct connect to %s, port %u\n", host, -+ port); -+ goto loser; -+#endif -+ - sock = PR_NewTCPSocket(); - if (sock == NULL) - goto loser; -diff --git a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c -index e8698376b5be..85791d84a932 100644 ---- a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c -+++ b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c -@@ -1334,6 +1334,13 @@ pkix_pl_Socket_Create( - plContext), - PKIX_COULDNOTCREATESOCKETOBJECT); - -+ // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but -+ // we want to ensure nothing can ever hit this code in production. -+#if 1 -+ printf("Tor Browser BUG: Attempted pkix direct socket connect\n"); -+ PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED); -+#endif -+ - socket->isServer = isServer; - socket->timeout = timeout; - socket->clientSock = NULL; -@@ -1433,6 +1440,13 @@ pkix_pl_Socket_CreateByName( - - localCopyName = PL_strdup(serverName); - -+ // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but -+ // we want to ensure nothing can ever hit this code in production. -+#if 1 -+ printf("Tor Browser BUG: Attempted pkix direct connect to %s\n", serverName); -+ PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED); -+#endif -+ - sepPtr = strchr(localCopyName, ':'); - /* First strip off the portnum, if present, from the end of the name */ - if (sepPtr) { -@@ -1582,6 +1596,13 @@ pkix_pl_Socket_CreateByHostAndPort( - PKIX_ENTER(SOCKET, "pkix_pl_Socket_CreateByHostAndPort"); - PKIX_NULLCHECK_THREE(hostname, pStatus, pSocket); - -+ // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but -+ // we want to ensure nothing can ever hit this code in production. -+#if 1 -+ printf("Tor Browser BUG: Attempted pkix direct connect to %s, port %u\n", hostname, -+ portnum); -+ PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED); -+#endif - - prstatus = PR_GetHostByName(hostname, buf, sizeof(buf), &hostent); - --- -2.27.0 - ===================================== projects/application-services/build ===================================== @@ -66,13 +66,21 @@ directory = "/var/tmp/build/application-services/vendor" offline=true EOF -pushd libs -ln -s $rootdir/[% c("input_files_by_name/nss") %] ./ -ln -s $rootdir/bug_13028.patch -patch -p2 < $rootdir/apply-bug-13028.diff -patch -p2 < $rootdir/no-ndk-lookup.diff -./build-all.sh desktop -./build-all.sh android +tar -xf $rootdir/[% c('input_files_by_name/uniffi-rs') %] + +# We add a suffix to the version to make it super specific. +# This is useful for developer builds, which seem to try to fetch +# latest versions of dependencies sometimes. +sed -i '$ s/$/-TORBROWSER/' version.txt + +cp $rootdir/cargo-no-build.sh megazords/full/android/ +chmod +x megazords/full/android/cargo-no-build.sh +patch -p1 < $rootdir/a-s-noop.diff + +pushd components/external/glean +cp $rootdir/cargo-no-build.sh glean-core/android-native/ +cp $builddir/uniffi-rs/uniffi-bindgen glean-core/android-native/ +patch -p1 < $rootdir/glean-noop.diff popd [% IF c('var/fetch_gradle_dependencies') %] @@ -88,7 +96,7 @@ popd export LANG=C.UTF-8 patch -p1 < $rootdir/local-repository.diff patch -p1 < $rootdir/ohttp-no-git.diff - patch -p1 < $rootdir/bug40485.diff + patch -p1 < $rootdir/bug40485-nimbus-fml-reproducibility.diff patch -p1 < $rootdir/offline-nimbus-fml.diff gradle_flags="--offline --no-daemon" gradle $gradle_flags assembleRelease ===================================== projects/application-services/cargo-no-build.sh ===================================== @@ -0,0 +1,8 @@ +#!/bin/bash + +if [[ "$1" == "build" ]]; then + echo "cargo build is disabled." + exit 0 +else + command cargo "$@" +fi ===================================== projects/application-services/config ===================================== @@ -11,8 +11,8 @@ var: gradle_dependencies_version: 11 gradle_version: 8.8 glean_parser: 14.0.1 - nss_version: '3.101' - nspr_version: '4.35' + # This is the only project for which the rust lib will actually be built + cargo_vendor_subdir: components/support/nimbus-fml steps: build: @@ -22,9 +22,6 @@ steps: # builds when build time differ a lot, we need to do periodic rebuilds: # https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_re… rebuild_date: '2024-09-12' - arch_deps: - # Needed to build NSS - - gyp input_files: - project: container-image pkg_type: build @@ -40,16 +37,15 @@ steps: - project: ninja name: ninja pkg_type: build + - project: uniffi-rs + name: uniffi-rs + pkg_type: build # Only Application Services currently requires build tools 30.0.3. # So, download them only here, rather than adding them to the shared # toolchain. - URL: 'https://dl.google.com/android/repository/build-tools_r30.0.3-linux.zip' name: build_tools_30 sha256sum: 24593500aa95d2f99fb4f10658aae7e65cb519be6cd33fa164f15f27f3c4a2d6 - # NSS version ans sha256 are in libs/build-all.sh. - - URL: 'https://ftp.mozilla.org/pub/security/nss/releases/NSS_[% c("var/nss_version") | replace("\\.", "_") %]_RTM/src/nss-[% c("var/nss_version") %]-with-nspr-[% c("var/nspr_version") %].tar.gz' - name: nss - sha256sum: 566faa9283ff3d9a7d6c44272df6e4330e3e06ca4e841a68840d31b27c9161c4 - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' @@ -67,15 +63,17 @@ steps: enable: '[% !c("var/fetch_gradle_dependencies") %]' - filename: gen_gradle_deps_file.sh enable: '[% c("var/fetch_gradle_dependencies") %]' - - filename: bug_13028.patch - - filename: apply-bug-13028.diff - # Delete when this patch is included upstream - - filename: bug40485.diff - - filename: no-ndk-lookup.diff + # tor-browser-build#40485: Make sure the Kotlin output of nimbus-fml + # has deterministic order for reproducibility. + # Delete when this patch is included upstream. + - filename: bug40485-nimbus-fml-reproducibility.diff # as-ohttp-client lists both the version for ohttp and a git repo + rev, # but this breaks the vendoring for offline builds. - filename: ohttp-no-git.diff - filename: offline-nimbus-fml.diff + - filename: glean-noop.diff + - filename: a-s-noop.diff + - filename: cargo-no-build.sh list_toolchain_updates: git_hash: 'v[% c("version") %]' ===================================== projects/application-services/glean-noop.diff ===================================== @@ -0,0 +1,26 @@ +diff --git a/glean-core/android-native/build.gradle b/glean-core/android-native/build.gradle +index 48769651..ade00ec3 100644 +--- a/glean-core/android-native/build.gradle ++++ b/glean-core/android-native/build.gradle +@@ -57,6 +57,8 @@ android { + } + + cargo { ++ cargoCommand = "${rootDir}/glean-core/android-native/cargo-no-build.sh" ++ + // The directory of the Cargo.toml to build. + module = '../bundle-android' + +diff --git a/glean-core/android/build.gradle b/glean-core/android/build.gradle +index 3568e40b..05f28296 100644 +--- a/glean-core/android/build.gradle ++++ b/glean-core/android/build.gradle +@@ -221,7 +221,7 @@ android.libraryVariants.all { variant -> + def udlFilePath = "../src/glean.udl" + def t = tasks.register("generate${variant.name.capitalize()}UniFFIBindings", Exec) { + workingDir project.rootDir +- commandLine 'cargo', 'uniffi-bindgen', 'generate', '--no-format', "${project.projectDir}/${udlFilePath}", '--language', 'kotlin', '--out-dir', "${buildDir}/${uniffiGeneratedPath}" ++ commandLine '${rootDir}/glean-core/android-native/uniffi-bindgen', 'generate', '--no-format', "${project.projectDir}/${udlFilePath}", '--language', 'kotlin', '--out-dir', "${buildDir}/${uniffiGeneratedPath}" + outputs.dir "${buildDir}/${uniffiGeneratedPath}" + // Re-generate if the interface definition changes. + inputs.file "${project.projectDir}/../src/glean.udl" ===================================== projects/application-services/list_toolchain_updates_checks ===================================== @@ -36,13 +36,13 @@ current='[% c("var/gradle_version") %]' check_update_needed gradle "$needed" "$current" -# nss-nspr +# uniffi read -d '' p << 'EOF' || true -if (m/NSS_ARCHIVE="nss-(.*-with-nspr-.*)\\.tar\\.gz"/) { +if (m/^\\s*uniffi\\s*=\\s*"([^"]*)"/) { print $1; exit; } EOF -needed=$(cat libs/build-all.sh | perl -ne "$p") -current='[% c("var/nss_version") %]-with-nspr-[% c("var/nspr_version") %]' -check_update_needed nss-nspr "$needed" "$current" +needed=$(cat Cargo.toml | perl -ne "$p") +current='[% pc("uniffi-rs", "version") %]' +check_update_needed uniffi "$needed" "$current" ===================================== projects/application-services/no-ndk-lookup.diff deleted ===================================== @@ -1,18 +0,0 @@ -diff --git a/libs/android_defaults.sh b/libs/android_defaults.sh -index 2cfcc4206..9e3d3de97 100755 ---- a/libs/android_defaults.sh -+++ b/libs/android_defaults.sh -@@ -1,11 +1,7 @@ - #!/usr/bin/env bash - --# Find the NDK. --pushd .. --NDK_VERSION=$(./gradlew -q printNdkVersion | tail -1) --export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/$NDK_VERSION" --export ANDROID_NDK_ROOT="$ANDROID_NDK_HOME" --popd || exit -+# Do not try to find the NDK, as it does not work offline. -+# We already define the needed variables in our environment. - - if [[ -z "${ANDROID_NDK_API_VERSION:-}" ]]; then - export ANDROID_NDK_API_VERSION=21 ===================================== projects/uniffi-rs/build ===================================== @@ -0,0 +1,34 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist +builddir=/var/tmp/build/[% project %] +mkdir -p $distdir/[% project %] +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/rust') %] +export PATH="/var/tmp/dist/rust/bin:$PATH" +[% IF c("var/linux") -%] + export LD_LIBRARY_PATH="/var/tmp/dist/rust/lib:$LD_LIBRARY_PATH" +[% END -%] +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] + +# Now prepare the offline build +# Move the directory for hardcoding the path in .cargo/config +mv /var/tmp/build/[% project %]-[% c('version') %] $builddir +tar -C $builddir -xf $rootdir/[% c('input_files_by_name/cargo_vendor') %] +cd $builddir +cat >> .cargo/config << 'EOF' +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "/var/tmp/build/uniffi-rs/vendor" +EOF + +cargo build --release --frozen --target x86_64-unknown-linux-gnu +mv target/x86_64-unknown-linux-gnu/release/uniffi-bindgen $distdir/[% project %] + +cd $distdir +[% c('tar', { + tar_src => [ project ], + tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'), + }) %] ===================================== projects/uniffi-rs/config ===================================== @@ -0,0 +1,20 @@ +# vim: filetype=yaml sw=2 +version: 0.27.1 +git_hash: bfb52effb0292f16d4c030d622887781639cbd1f +git_url: https://gitlab.torproject.org/tpo/applications/uniffi-rs.git +container: + use_container: 1 + +steps: + build: + filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' + input_files: + - project: container-image + pkg_type: build + - project: rust + name: rust + - name: cargo_vendor + project: uniffi-rs + pkg_type: cargo_vendor + norec: + sha256sum: 12a61a3dbe65a3946ed58fff3d849d11c9ade5818e2ef5771d2a2a531e25f553 ===================================== rbm.conf ===================================== @@ -30,7 +30,7 @@ steps: export PATH="/var/tmp/dist/rust/bin:$PATH" tar -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] cd [% project %]-[% c('version') %] - cargo vendor --locked vendor + cargo vendor --locked vendor --manifest-path [% IF c('var/cargo_vendor_subdir') %][% c('var/cargo_vendor_subdir') %]/[% END %]Cargo.toml [% c('tar', { tar_src => [ 'vendor' ], tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'), 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] Pushed new tag tor-browser-129.0a1-15.0-1-build2
by Pier Angelo Vendrame (＠pierov) 11 Feb '25

11 Feb '25

Pier Angelo Vendrame pushed new tag tor-browser-129.0a1-15.0-1-build2 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-129.0a1-15.0-1] 67 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 11 Feb '25

11 Feb '25

Pier Angelo Vendrame pushed to branch tor-browser-129.0a1-15.0-1 at The Tor Project / Applications / Tor Browser Commits: ccaf390b by Pier Angelo Vendrame at 2025-02-10T17:23:56+01:00 fixup! Firefox preference overrides. BB 43236: Disable vsync on Wayland. Vsync leaks the monitor refresh rate, therefore it is already disabled on other platforms, including Linux/X11 and Windows. - - - - - 67100207 by Pier Angelo Vendrame at 2025-02-10T17:23:56+01:00 BB 43386: Use Firefox in the UA in RFP-exempt request. XHR requests initiated by extensions are exempt from RFP. Therefore, they report the actual app name, instead of Firefox, and the actual Firefox minor version. This happens whenever the app name has been customized and does not match a hardcoded "Firefox". - - - - - ba58f4de by clairehurst at 2025-02-10T17:23:57+01:00 [android] Bug_43351: Add function to disable forcing ALL CAPS for the fenix snackbar action button text This is needed because the default snackbar will force all caps, which can cause problems in some languages. See tor-browser#43351 and bugzilla bug 1935387. TODO: Remove once the forced all caps is removed by mozilla. - - - - - 6f91b386 by Beatriz Rizental at 2025-02-10T17:23:57+01:00 fixup! Add CI for Tor Browser - - - - - 329323a6 by Pier Angelo Vendrame at 2025-02-10T17:23:57+01:00 fixup! Firefox preference overrides. BB 41065: Hardcode the limit of storage quota. Currently, we return min(10GB, 0.2 * available space in the fs). This is bad for systems that have less than 50GB free, especially live systems, such as Tails. Set a pref to replace the available space with a hardcoded limit (5GiB). - - - - - 4adb5447 by Pier Angelo Vendrame at 2025-02-10T17:23:57+01:00 fixup! Firefox preference overrides. BB 43402: set browser.startup.blankWindow false. - - - - - 3058bb98 by Henry Wilkes at 2025-02-10T17:23:58+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Return only the bridge settings from Moat. Rather than return { bridges: enabled: true, ... } from MoatRPC API, we just return the relevant parts. This should make it clearer that Moat can *only* change TorSettings.bridges, and nothing else. - - - - - 77611c5d by Henry Wilkes at 2025-02-10T17:23:58+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Have Moat bridges pass through TorSettings rather than using TorProvider directly. TorSettings should be the only caller to TorProvider.writeSettings, so we can establish more control over which bridges are in use at any given moment in one place. Also add some sanitation to the Moat response. - - - - - 74814eb6 by Henry Wilkes at 2025-02-10T17:23:58+01:00 fixup! TB 40933: Add tor-launcher functionality TB 41921: Use temporary bridges for TorProvider initialisation. It is unlikely that temporary bridges would be present when TorProvider is initialised, but it should be using whatever TorSettings.applySettings uses. - - - - - 8acf85a0 by Henry Wilkes at 2025-02-10T17:23:58+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Only use TorSettings.changeSettings to change the Tor settings and apply them in one method. The granular methods have been made private. - - - - - 86a0463e by Henry Wilkes at 2025-02-10T17:23:59+01:00 fixup! TB 42247: Android helpers for the TorProvider TB 41921: Only use TorSettings.changeSettings to change the Tor settings and apply them in one method. We drop redundant arguments and unused methods from android integration. - - - - - 7da76500 by Henry Wilkes at 2025-02-10T17:23:59+01:00 fixup! TB 41878: [android] Add standalone Tor Bootstrap TB 41921: Drop redundant arguments to getTorIntegration().setSettings. All calls to this method passed true for the last two arguments. - - - - - b1de0b1f by Henry Wilkes at 2025-02-10T17:23:59+01:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 41921: Only use TorSettings.changeSettings to change the Tor settings and apply them in one method. - - - - - e399886a by Henry Wilkes at 2025-02-10T17:23:59+01:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser TB 41921: Only use TorSettings.changeSettings to change the Tor settings and apply them in one method. - - - - - 5f8a8997 by Henry Wilkes at 2025-02-10T17:23:59+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Make the TorSettings properties read-only outside of the TorSettings modules. Within TorSettings we make all post initialisation changes in changeSettings. This means we can simplify the class and move all the setter logic into one place. - - - - - b928574f by Henry Wilkes at 2025-02-10T17:24:00+01:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 41921: Pass in the BridgeDB bridge_strings as an Array to TorSettings. - - - - - d7354d74 by Henry Wilkes at 2025-02-10T17:24:00+01:00 fixup! TB 40933: Add tor-launcher functionality TB 41921: Move prompt_at_startup preference from TorProvider to TorConnect only. - - - - - d2db4edd by Henry Wilkes at 2025-02-10T17:24:00+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Move prompt_at_startup pref from TorProvider to TorConnect only. This simplifies the logic, where we set the preference any time we have a bootstrap error and clear it when we are bootstrapped. - - - - - 0df84c25 by Henry Wilkes at 2025-02-10T17:24:00+01:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 41921: Move flushSettings call to TorSettings. The call in connectionPane will not necessarily run when the preference tab is closed, nor will it trigger for bridges added through auto-bootstrapping. - - - - - 50ecf95b by Henry Wilkes at 2025-02-10T17:24:01+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Flush TorSettings settings every time they are saved. - - - - - 4af07293 by Henry Wilkes at 2025-02-10T17:24:01+01:00 fixup! TB 40933: Add tor-launcher functionality TB 41921: Add a NOTE for future development ensuring that writeSettings is not subject to any races between sequential calls. - - - - - ee562d86 by Henry Wilkes at 2025-02-10T17:24:01+01:00 fixup! TB 40933: Add tor-launcher functionality TB 41921: Ensure shouldStartAndOwnTor is constant per-session. TorConnect and TorSettings `enabled` properties depend on this value, and shouldn't change per session. - - - - - bf84f466 by Henry Wilkes at 2025-02-10T17:24:01+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Tighten up TorSettings. We ensure TorSettings is enabled before certain operations. Also tidy up uninit to account for early calls (before init completes) or repeat calls. Also stop using "torbrowser.settings.enabled" preference, and read from the preferences for the first run. Also make TorSettings.initailizedPromise read-only. - - - - - ee5ae62a by Henry Wilkes at 2025-02-10T17:24:02+01:00 fixup! TB 40562: Added Tor Browser preferences to 000-tor-browser.js TB 41921: Set default TorSetting setting values in 000-tor-browser.js. - - - - - bfef38c6 by Henry Wilkes at 2025-02-10T17:24:02+01:00 fixup! TB 41435: Add a Tor Browser migration function TB 41921: Clear out unused "torbrowser.settings.enabled" preference. - - - - - c3711b8e by Henry Wilkes at 2025-02-10T17:24:02+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Move quickstart setting from TorSettings to TorConnect. - - - - - d4ae2cd6 by Henry Wilkes at 2025-02-10T17:24:02+01:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 41921: Move quickstart setting from TorSettings to TorConnect. - - - - - d88bb531 by Henry Wilkes at 2025-02-10T17:24:03+01:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser TB 41921: Move quickstart setting from TorSettings to TorConnect. This also means we no longer need to listen for TorSettingsTopics.Ready for the initial value. Also fix typo in signal name: "quickstart-changed" to "quickstart-change". - - - - - 9db9034d by Henry Wilkes at 2025-02-10T17:24:03+01:00 fixup! TB 42247: Android helpers for the TorProvider TB 41921: Move quickstart setting from TorSettings to TorConnect. - - - - - e4ee80ae by Henry Wilkes at 2025-02-10T17:24:03+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Do not wait for TorSettings to initialise before allowing a bootstrap. Instead, we wait for TorSettings as required: for preparing AutoBootstrap attempts, and TorBootstrapRequest should already wait for TorSettings before attempting to connect. - - - - - 51af454c by Henry Wilkes at 2025-02-10T17:24:03+01:00 fixup! TB 40933: Add tor-launcher functionality TB 41921: Ensure TorProviderBuilder.build can be called immediately after TorProviderBuilder.init returns (without await). We make sure that the `#provider` instance is created before any break in execution caused by an `await`. - - - - - bb3cff4d by Henry Wilkes at 2025-02-10T17:24:03+01:00 fixup! TB 42247: Android helpers for the TorProvider TB 41921: Do not wait for TorProviderBuilder.init since it is no longer async. - - - - - 2ee51acd by Henry Wilkes at 2025-02-10T17:24:04+01:00 fixup! TB 40933: Add tor-launcher functionality TB 41921: Add a note to TorBootstrapRequest explaining the expectation that the TorProvider has already read from TorSettings before it connects. - - - - - 306fc85a by clairehurst at 2025-02-10T17:24:04+01:00 fixup! [android] Implement Android-native Connection Assist UI Bug 43359: Improper handling of TorBootstrapChangeListener with respect to system onDestroy() calls for HomeActivity - - - - - 2290e9b4 by clairehurst at 2025-02-10T17:24:04+01:00 fixup! [android] Add standalone Tor Bootstrap Bug 43360: Replace custom variable isBeingRecreated with built-in isFinishing function - - - - - 0b867753 by clairehurst at 2025-02-10T17:24:04+01:00 fixup! [android] Add standalone Tor Bootstrap Bug 43368: Add @Suppress for linting error "Overriding method should call super. onNewIntent" - - - - - 9ef85012 by Henry Wilkes at 2025-02-10T17:24:05+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Reset bootstrap stage when bridge settings change. In particular, this will cancel an autobootstrap when the user manually changes the bridge settings. However we apply this to all bootstrap attempts for consistency. By resetting to the Start stage, we also ensure that about:torconnect UI no longer shows the "Try bridges" pages when the user manually changes their bridges themselves. - - - - - 2c1ab622 by Henry Wilkes at 2025-02-10T17:24:05+01:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 41921: Also show the "Connect" button for bridge dialogs when we have an ongoing bootstrap attempt. With the new behaviour, changing the settings while not bootstrapped will cancel any ongoing bootstrap. Therefore, we can start a new bootstrap using the new settings. - - - - - 86caa2b2 by Henry Wilkes at 2025-02-10T17:24:05+01:00 fixup! Add CI for Tor Browser MB 324: Revert tor-browser changes that add update-translations CI. - - - - - fe9c62cc by Henry Wilkes at 2025-02-10T17:24:05+01:00 Revert "TB 42305: Add script to combine translation files across versions." This reverts commit 3247633d3f6bf60be7feaf2e3515d9b7c2b1dad0. - - - - - d6fa9624 by Henry Wilkes at 2025-02-10T17:24:06+01:00 fixup! Add CI for Base Browser MB 324: Move update-translations CI to base-browser. - - - - - ddaea819 by Henry Wilkes at 2025-02-10T17:24:06+01:00 BB 42305: Add script to combine translation files across versions. - - - - - 0ef82fcf by Henry Wilkes at 2025-02-10T17:24:06+01:00 fixup! Add CI for Tor Browser MB 324: Re-introduce tor-browser changes to update-translations - - - - - 882b73b6 by Pier Angelo Vendrame at 2025-02-10T17:24:06+01:00 fixup! TB 42247: Android helpers for the TorProvider Add a missing return to #getAllSettings(). - - - - - dbce6a68 by Pier Angelo Vendrame at 2025-02-10T17:24:07+01:00 fixup! TB 2176: Rebrand Firefox to TorBrowser TB 43323: Add an asset for sanity tests. - - - - - bd5cbca8 by Henry Wilkes at 2025-02-10T17:24:07+01:00 fixup! Add CI for Tor Browser MB 324: Move update-translations from tor-browser to base-browser. Should be dropped at the next rebase. - - - - - 5178f2d9 by Henry Wilkes at 2025-02-10T17:24:07+01:00 fixup! Add CI for Base Browser MB 324: Move update-translations from tor-browser to base-browser. - - - - - a602ba5c by Pier Angelo Vendrame at 2025-02-10T17:24:07+01:00 fixup! Adding issue and merge request templates Remove "Emergency" from security updates as per today's meeting. Our policy usually is to backport (almost) all emergency fixes, sooner or later. The actual emergency can be inferred from the timeline. - - - - - 281658b7 by Morgan at 2025-02-10T17:24:08+01:00 fixup! TB 41649: Create rebase and security backport gitlab issue templates - TB 43298: add rebase template for nightly-based Tor Browser Alpha and Bugzilla Triage Issue generation - TB 43341: Create Firefox Nightly Rebase Issue Template - - - - - 144d6abb by Henry Wilkes at 2025-02-10T17:24:08+01:00 fixup! BB 42305: Add script to combine translation files across versions. MB 324: Make the added comments also work for Mullvad Browser. - - - - - e3a0e855 by clairehurst at 2025-02-10T17:24:08+01:00 fixup! TB 40933: Add tor-launcher functionality Bug 43222: Fix tor logs timestamps - - - - - 398c6cce by clairehurst at 2025-02-10T17:24:08+01:00 fixup! TB 42247: Android helpers for the TorProvider Bug 43222: Fix tor logs timestamps - - - - - e3488ef5 by clairehurst at 2025-02-10T17:24:08+01:00 fixup! TB 41878: [android] Add standalone Tor Bootstrap Bug 43222: Fix tor logs timestamps - - - - - 4c2cb7e6 by clairehurst at 2025-02-10T17:24:09+01:00 fixup! TB 40041 [android]: Implement Tor Network Settings Bug 43222: Fix tor logs timestamps - - - - - 04fe9107 by Beatriz Rizental at 2025-02-10T17:24:09+01:00 fixup! Add CI for Base Browser Attempt to download MR branch in case fetching fails due to the pipeline running in the parent project context. - - - - - 94fa5417 by Pier Angelo Vendrame at 2025-02-10T17:24:09+01:00 Revert "BB 42647: Make OS HTTP User-Agent OS spoofing configurable by pref" This reverts commit 57c94a79410783c564187a9496d7a5403accf15e. - - - - - c92cc90c by Pier Angelo Vendrame at 2025-02-10T17:33:17+01:00 Bug 1840385 - Do not spoof the OS in HTTP User Agent. r=tjr Differential Revision: https://phabricator.services.mozilla.com/D234835 - - - - - 18d26d7f by Henry Wilkes at 2025-02-10T17:33:20+01:00 fixup! TB 40458: Implement .tor.onion aliases TB 41831: Add additional effective TLD for abc.au.securedrop.tor.onion exception. - - - - - 52881321 by Beatriz Rizental at 2025-02-10T17:33:20+01:00 fixup! Add CI for Tor Browser Revert changes that will not be part of the Base Browser commit - - - - - a1146389 by Beatriz Rizental at 2025-02-10T17:33:20+01:00 fixup! Add CI for Base Browser - - - - - db182914 by Beatriz Rizental at 2025-02-10T17:33:20+01:00 fixup! Add CI for Base Browser - - - - - 45830b74 by Beatriz Rizental at 2025-02-10T17:33:21+01:00 fixup! Add CI for Base Browser Fetch specific branch when prepopulating history from local repository. - - - - - d182dd51 by Beatriz Rizental at 2025-02-10T17:33:21+01:00 TB 43243: [android] Implement Android launch test Also remove exit call from terminate function. It causes all espresso tests to crash on exit and otherwise doesn't do anything. - - - - - abe3f667 by Beatriz Rizental at 2025-02-10T17:33:21+01:00 fixup! Add CI for Tor Browser Implement Nightly startup tests for Android - - - - - 41a14ffe by Henry Wilkes at 2025-02-10T17:33:21+01:00 fixup! TB 40597: Implement TorSettings module TB 43254: Allow some DomainFrontedRequests to be cancelled. This is used by some of the Moat calls to stop abandoned requests running in the background: 1. Cancelled AutoBootstraps. 2. Cancelled CAPTCHA request/submissions. - - - - - d290912a by Henry Wilkes at 2025-02-10T17:33:22+01:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 43254: Cancel Moat requests when the CAPTHCA dialog is closed. - - - - - 115ea410 by Beatriz Rizental at 2025-02-10T17:56:43+01:00 fixup! Add CI for Base Browser - - - - - 55 changed files: - + .gitlab/ci/jobs/startup-test/startup-test-android.py - .gitlab/ci/jobs/startup-test/startup-test.yml - .gitlab/ci/jobs/update-translations.yml - .gitlab/ci/mixins.yml - + .gitlab/issue_templates/Bugzilla Triage.md - + .gitlab/issue_templates/Rebase Browser - Rapid.md - .gitlab/merge_request_templates/default.md - browser/app/profile/000-tor-browser.js - browser/app/profile/001-base-profile.js - browser/components/BrowserGlue.sys.mjs - browser/components/resistfingerprinting/test/browser/browser_navigator.js - browser/components/resistfingerprinting/test/browser/browser_navigator_iframes.js - browser/components/torpreferences/content/builtinBridgeDialog.js - browser/components/torpreferences/content/connectionPane.js - browser/components/torpreferences/content/connectionSettingsDialog.js - browser/components/torpreferences/content/provideBridgeDialog.js - browser/components/torpreferences/content/requestBridgeDialog.js - dom/base/Navigator.cpp - + mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/AppStartupTest.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorController.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLog.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsComposeFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsViewModel.kt - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorIntegrationAndroid.java - netwerk/dns/effective_tld_names.dat - netwerk/protocol/http/nsHttpHandler.cpp - toolkit/components/resistfingerprinting/nsRFPService.cpp - toolkit/components/resistfingerprinting/nsRFPService.h - toolkit/components/tor-launcher/TorBootstrapRequest.sys.mjs - toolkit/components/tor-launcher/TorControlPort.sys.mjs - toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs - toolkit/components/tor-launcher/TorProvider.sys.mjs - toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs - toolkit/components/torconnect/TorConnectParent.sys.mjs - toolkit/modules/BridgeDB.sys.mjs - toolkit/modules/DomainFrontedRequests.sys.mjs - toolkit/modules/Moat.sys.mjs - toolkit/modules/TorAndroidIntegration.sys.mjs - toolkit/modules/TorConnect.sys.mjs - toolkit/modules/TorSettings.sys.mjs - + toolkit/themes/shared/icons/torbrowser.png - toolkit/themes/shared/minimal-toolkit.jar.inc.mn - tools/torbrowser/l10n/combine-translation-versions.py → tools/base-browser/l10n/combine-translation-versions.py - tools/torbrowser/l10n/combine/__init__.py → tools/base-browser/l10n/combine/__init__.py - tools/torbrowser/l10n/combine/combine.py → tools/base-browser/l10n/combine/combine.py - tools/torbrowser/l10n/combine/tests/README → tools/base-browser/l10n/combine/tests/README - tools/torbrowser/l10n/combine/tests/__init__.py → tools/base-browser/l10n/combine/tests/__init__.py - tools/torbrowser/l10n/combine/tests/test_android.py → tools/base-browser/l10n/combine/tests/test_android.py - tools/torbrowser/l10n/combine/tests/test_dtd.py → tools/base-browser/l10n/combine/tests/test_dtd.py - tools/torbrowser/l10n/combine/tests/test_fluent.py → tools/base-browser/l10n/combine/tests/test_fluent.py - tools/torbrowser/l10n/combine/tests/test_properties.py → tools/base-browser/l10n/combine/tests/test_properties.py The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b66b82… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b66b82… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher][main] metainfo: Add developer tag
by asciiwolf (＠asciiwolf) 10 Feb '25

10 Feb '25

asciiwolf pushed to branch main at The Tor Project / Applications / torbrowser-launcher Commits: 40b03cdf by asciiwolf at 2025-02-10T20:06:39+00:00 metainfo: Add developer tag It is required by newer AppStream standard versions. Also keep the developer_name one for compatibility purposes - - - - - 1 changed file: - share/metainfo/org.torproject.torbrowser-launcher.metainfo.xml Changes: ===================================== share/metainfo/org.torproject.torbrowser-launcher.metainfo.xml ===================================== @@ -8,6 +8,9 @@ <project_license>MIT</project_license> <name>Tor Browser Launcher</name> <developer_name>Tor Project</developer_name> + <developer id="org.torproject"> + <name>Tor Project</name> + </developer> <summary>A program to help you download, keep updated, and run Tor Browser</summary> <description> Tor Browser Launcher is intended to make Tor Browser easier to maintain and use for GNU/Linux users. It downloads the same Tor Browser from torproject.org that everyone else uses, and it doesn't alter it in any way. But it does make it much more usable, and it makes the task of keeping it up-to-date more secure. View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/commit… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/commit… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher][main] 2 commits: metainfo.xml: Remove references to Bundle/TBB
by asciiwolf (＠asciiwolf) 10 Feb '25

10 Feb '25

asciiwolf pushed to branch main at The Tor Project / Applications / torbrowser-launcher Commits: f2b99afa by John Veness at 2025-02-09T23:42:11+00:00 metainfo.xml: Remove references to Bundle/TBB - - - - - b9003ce1 by asciiwolf at 2025-02-10T19:58:16+00:00 Merge branch 'patch-1' into 'main' metainfo.xml: Remove references to Bundle/TBB See merge request tpo/applications/torbrowser-launcher!22 - - - - - 1 changed file: - share/metainfo/org.torproject.torbrowser-launcher.metainfo.xml Changes: ===================================== share/metainfo/org.torproject.torbrowser-launcher.metainfo.xml ===================================== @@ -8,14 +8,14 @@ <project_license>MIT</project_license> <name>Tor Browser Launcher</name> <developer_name>Tor Project</developer_name> - <summary>A program to help you download, keep updated, and run the Tor Browser Bundle</summary> + <summary>A program to help you download, keep updated, and run Tor Browser</summary> <description> - Tor Browser Launcher is intended to make the Tor Browser Bundle (TBB) easier to maintain and use for GNU/Linux users. It downloads the same TBB from torproject.org that everyone else uses, and it doesn't alter it in any way. But it does make it much more usable, and it makes the task of keeping it up-to-date more secure. + Tor Browser Launcher is intended to make Tor Browser easier to maintain and use for GNU/Linux users. It downloads the same Tor Browser from torproject.org that everyone else uses, and it doesn't alter it in any way. But it does make it much more usable, and it makes the task of keeping it up-to-date more secure. You install torbrowser-launcher from your distribution's package manager and it handles everything else, including: <ul> - <li>Downloading the most recent version of TBB for you, in your language and for your architecture</li> + <li>Downloading the most recent version of Tor Browser for you, in your language and for your architecture</li> <li>Automatically updating (while preserving your bookmarks and preferences)</li> - <li>Verifying the TBB's GnuPG signature</li> + <li>Verifying Tor Browser's GnuPG signature</li> <li>Includes AppArmor profiles to make a Tor Browser compromise not as bad (in some distros)</li> <li>Adding a Tor Browser application launcher to your desktop environment's menu</li> <li>Lets you set Tor Browser as your default browser</li> View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/compar… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/compar… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher] Deleted branch 23-revert-full-dbus-session-access
by intrigeri (＠intrigeri) 10 Feb '25

10 Feb '25

intrigeri deleted branch 23-revert-full-dbus-session-access at The Tor Project / Applications / torbrowser-launcher -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher][main] 2 commits: Don't grant full D-Bus session bus access
by asciiwolf (＠asciiwolf) 10 Feb '25

10 Feb '25

asciiwolf pushed to branch main at The Tor Project / Applications / torbrowser-launcher Commits: ac5c4d3e by intrigeri at 2025-02-10T19:52:42+00:00 Don't grant full D-Bus session bus access - - - - - 54515d0e by asciiwolf at 2025-02-10T19:52:42+00:00 Merge branch '23-revert-full-dbus-session-access' into 'main' Don't grant full D-Bus session bus access Closes #23 See merge request tpo/applications/torbrowser-launcher!23 - - - - - 1 changed file: - apparmor/torbrowser.Browser.firefox Changes: ===================================== apparmor/torbrowser.Browser.firefox ===================================== @@ -11,7 +11,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} { #include <abstractions/mesa> #include <abstractions/opencl> #include if exists <abstractions/vulkan> - #include if exists <abstractions/dbus-session> + #include if exists <abstractions/dbus-session-strict> deny capability sys_ptrace, View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/compar… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/compar… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-14.5a3-build1
by morgan (＠morgan) 10 Feb '25

10 Feb '25

morgan pushed new tag mb-14.5a3-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-… You're receiving this email because of your account on gitlab.torproject.org.

1 0