- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-13.0a2-build5
by richard (＠richard) 11 Aug '23

11 Aug '23

richard pushed new tag tbb-13.0a2-build5 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40901: Prepare Tor Browser 13.0a2-build5
by richard (＠richard) 11 Aug '23

11 Aug '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: d41f0f7b by Richard Pospesel at 2023-08-11T22:48:30+00:00 Bug 40901: Prepare Tor Browser 13.0a2-build5 - - - - - 4 changed files: - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/firefox-android/config - projects/firefox-android/gradle-dependencies-list.txt - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -24,6 +24,7 @@ Tor Browser 13.0a2 - August 08 2023 * Bug 40919: Fix nimbus-fml reproducibility of 13.0a2-build1 [tor-browser-build] * Bug 41928: Backport Android-specific security fixes from Firefox 116 to ESR 102.14 / 115.1 - based Tor Browser [tor-browser] * Bug 41972: Disable Firefox onboarding in 13.0 [tor-browser] + * Bug 41997: Remove all use and reference to com.adjust.sdk.Adjust which now uses AD_ID [tor-browser] * Build System * All Platforms * Updated Go to 1.20.7 ===================================== projects/firefox-android/config ===================================== @@ -16,7 +16,7 @@ container: var: fenix_version: 115.2.0 browser_branch: 13.0-1 - browser_build: 4 + browser_build: 5 platform_version: 115.0 variant: Beta # This should be updated when the list of gradle dependencies is changed. ===================================== projects/firefox-android/gradle-dependencies-list.txt ===================================== @@ -801,8 +801,6 @@ f5759b7fcdfc83a525a036deedcbd32e5b536b625ebc282426f16ca137eb5902 | https://repo. 770471090ca40a17b9e436ee2ec00819be42042da6f4085ece1d37916dc08ff9 | https://repo.maven.apache.org/maven2/backport-util-concurrent/backport-util… 2bf4e59f3acd106fea6145a9a88fe8956509f8b9c0fdd11eb96fee757269e3f3 | https://repo.maven.apache.org/maven2/classworlds/classworlds/1.1-alpha-2/cl… 0cc647963b74ad1d7a37c9868e9e5a8f474e49297e1863582253a08a4c719cb1 | https://repo.maven.apache.org/maven2/classworlds/classworlds/1.1-alpha-2/cl… -9e45ecc7775a250d953e980d9f2a2c38fc7729291cba3fe75140a99e316d3d89 | https://repo.maven.apache.org/maven2/com/adjust/sdk/adjust-android/4.33.0/a… -aa17ade4ae7e8dd81fa495de04ef9481a139224fc6503dd6fa5fb2698ae8310d | https://repo.maven.apache.org/maven2/com/adjust/sdk/adjust-android/4.33.0/a… 243a64470fda0e86a6fddeb0af4c7aa9426ce84e68cbfe18d75ee5da4b7e0b92 | https://repo.maven.apache.org/maven2/com/almworks/sqlite4java/sqlite4java/1… 139552c586a57bf6d98f87d6b7e23fef4db53cf74097be962f7868e3606c79d2 | https://repo.maven.apache.org/maven2/com/almworks/sqlite4java/sqlite4java/1… 3f59eca516374ccd4fd3551625bf50f8a4b191f700508f7ce4866460a6128af0 | https://repo.maven.apache.org/maven2/com/github/gundy/semver4j/0.16.4/semve… ===================================== rbm.conf ===================================== @@ -82,7 +82,7 @@ buildconf: var: torbrowser_version: '13.0a2' - torbrowser_build: 'build4' + torbrowser_build: 'build5' torbrowser_incremental_from: - '13.0a1' updater_enabled: 1 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/firefox-android] Pushed new tag firefox-android-115.2.0-13.0-1-build5
by Dan Ballard (＠dan) 11 Aug '23

11 Aug '23

Dan Ballard pushed new tag firefox-android-115.2.0-13.0-1-build5 at The Tor Project / Applications / firefox-android -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/tree/firef… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.0-13.0-1] fixup! Disable features and functionality
by richard (＠richard) 11 Aug '23

11 Aug '23

richard pushed to branch firefox-android-115.2.0-13.0-1 at The Tor Project / Applications / firefox-android Commits: 2e2c4d37 by Dan Ballard at 2023-08-11T15:25:56-07:00 fixup! Disable features and functionality Bug 41997: Remove all use and reference to com.adjust.sdk.Adjust which now uses AD_ID - - - - - 3 changed files: - fenix/app/build.gradle - fenix/app/src/main/java/org/mozilla/fenix/components/metrics/AdjustMetricsService.kt - fenix/buildSrc/src/main/java/FenixDependencies.kt Changes: ===================================== fenix/app/build.gradle ===================================== @@ -633,7 +633,6 @@ dependencies { implementation FenixDependencies.protobuf_javalite implementation FenixDependencies.google_material - implementation FenixDependencies.adjust implementation FenixDependencies.installreferrer // Required by Adjust // Required for in-app reviews ===================================== fenix/app/src/main/java/org/mozilla/fenix/components/metrics/AdjustMetricsService.kt ===================================== @@ -8,10 +8,6 @@ import android.app.Activity import android.app.Application import android.os.Bundle import android.util.Log -import com.adjust.sdk.Adjust -import com.adjust.sdk.AdjustConfig -import com.adjust.sdk.AdjustEvent -import com.adjust.sdk.LogLevel import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -31,76 +27,16 @@ class AdjustMetricsService( override val type = MetricServiceType.Marketing override fun start() { - if ((BuildConfig.ADJUST_TOKEN.isNullOrBlank())) { - Log.i(LOGTAG, "No adjust token defined") - - if (Config.channel.isReleased && !BuildConfig.DATA_COLLECTION_DISABLED) { - throw IllegalStateException("No adjust token defined for release build") - } - - return - } - - val config = AdjustConfig( - application, - BuildConfig.ADJUST_TOKEN, - AdjustConfig.ENVIRONMENT_PRODUCTION, - true, - ) - config.setPreinstallTrackingEnabled(true) - - val installationPing = FirstSessionPing(application) - - val timerId = FirstSession.adjustAttributionTime.start() - config.setOnAttributionChangedListener { - FirstSession.adjustAttributionTime.stopAndAccumulate(timerId) - if (!it.network.isNullOrEmpty()) { - application.applicationContext.settings().adjustNetwork = - it.network - } - if (!it.adgroup.isNullOrEmpty()) { - application.applicationContext.settings().adjustAdGroup = - it.adgroup - } - if (!it.creative.isNullOrEmpty()) { - application.applicationContext.settings().adjustCreative = - it.creative - } - if (!it.campaign.isNullOrEmpty()) { - application.applicationContext.settings().adjustCampaignId = - it.campaign - } - - installationPing.checkAndSend() - } - - config.setLogLevel(LogLevel.SUPRESS) - Adjust.onCreate(config) - Adjust.setEnabled(true) - application.registerActivityLifecycleCallbacks(AdjustLifecycleCallbacks()) + /* noop */ } override fun stop() { - Adjust.setEnabled(false) - Adjust.gdprForgetMe(application.applicationContext) + /* noop */ } @Suppress("TooGenericExceptionCaught") override fun track(event: Event) { - CoroutineScope(dispatcher).launch { - try { - if (event is Event.GrowthData) { - if (storage.shouldTrack(event)) { - Adjust.trackEvent(AdjustEvent(event.tokenName)) - storage.updateSentState(event) - } else { - storage.updatePersistentState(event) - } - } - } catch (e: Exception) { - crashReporter.submitCaughtException(e) - } - } + /* noop */ } override fun shouldTrack(event: Event): Boolean = @@ -112,11 +48,11 @@ class AdjustMetricsService( private class AdjustLifecycleCallbacks : Application.ActivityLifecycleCallbacks { override fun onActivityResumed(activity: Activity) { - Adjust.onResume() + /* noop */ } override fun onActivityPaused(activity: Activity) { - Adjust.onPause() + /* noop */ } override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) { /* noop */ } ===================================== fenix/buildSrc/src/main/java/FenixDependencies.kt ===================================== @@ -127,7 +127,6 @@ object FenixDependencies { const val protobuf_javalite = "com.google.protobuf:protobuf-javalite:${FenixVersions.protobuf}" const val protobuf_compiler = "com.google.protobuf:protoc:${FenixVersions.protobuf}" - const val adjust = "com.adjust.sdk:adjust-android:${FenixVersions.adjust}" const val installreferrer = "com.android.installreferrer:installreferrer:${FenixVersions.installreferrer}" const val junit = "junit:junit:${FenixVersions.junit}" View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/2e2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/2e2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] Revert "alpha: new version, 13.0a2"
by richard (＠richard) 11 Aug '23

11 Aug '23

richard pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: a9484c74 by Richard Pospesel at 2023-08-11T22:21:31+00:00 Revert "alpha: new version, 13.0a2" This reverts commit 3b1612d4e52ed4d44f86d529ea551f60e7e795dd. - - - - - 30 changed files: - update_3/alpha/.htaccess - + update_3/alpha/12.5a5-13.0a1-linux32-ALL.xml - + update_3/alpha/12.5a5-13.0a1-linux64-ALL.xml - + update_3/alpha/12.5a5-13.0a1-macos-ALL.xml - + update_3/alpha/12.5a5-13.0a1-win32-ALL.xml - + update_3/alpha/12.5a5-13.0a1-win64-ALL.xml - + update_3/alpha/12.5a6-13.0a1-linux32-ALL.xml - + update_3/alpha/12.5a6-13.0a1-linux64-ALL.xml - + update_3/alpha/12.5a6-13.0a1-macos-ALL.xml - + update_3/alpha/12.5a6-13.0a1-win32-ALL.xml - + update_3/alpha/12.5a6-13.0a1-win64-ALL.xml - + update_3/alpha/12.5a7-13.0a1-linux32-ALL.xml - + update_3/alpha/12.5a7-13.0a1-linux64-ALL.xml - + update_3/alpha/12.5a7-13.0a1-macos-ALL.xml - + update_3/alpha/12.5a7-13.0a1-win32-ALL.xml - + update_3/alpha/12.5a7-13.0a1-win64-ALL.xml - − update_3/alpha/13.0a1-13.0a2-linux32-ALL.xml - − update_3/alpha/13.0a1-13.0a2-linux64-ALL.xml - − update_3/alpha/13.0a1-13.0a2-macos-ALL.xml - − update_3/alpha/13.0a1-13.0a2-win32-ALL.xml - − update_3/alpha/13.0a1-13.0a2-win64-ALL.xml - + update_3/alpha/13.0a1-linux32-ALL.xml - + update_3/alpha/13.0a1-linux64-ALL.xml - + update_3/alpha/13.0a1-macos-ALL.xml - + update_3/alpha/13.0a1-win32-ALL.xml - + update_3/alpha/13.0a1-win64-ALL.xml - − update_3/alpha/13.0a2-linux32-ALL.xml - − update_3/alpha/13.0a2-linux64-ALL.xml - − update_3/alpha/13.0a2-macos-ALL.xml - − update_3/alpha/13.0a2-win32-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-update-responses][main] alpha: new version, 13.0a2
by richard (＠richard) 11 Aug '23

11 Aug '23

richard pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 3b1612d4 by Richard Pospesel at 2023-08-11T20:44:50+00:00 alpha: new version, 13.0a2 - - - - - 30 changed files: - update_3/alpha/.htaccess - − update_3/alpha/12.5a5-13.0a1-linux32-ALL.xml - − update_3/alpha/12.5a5-13.0a1-linux64-ALL.xml - − update_3/alpha/12.5a5-13.0a1-macos-ALL.xml - − update_3/alpha/12.5a5-13.0a1-win32-ALL.xml - − update_3/alpha/12.5a5-13.0a1-win64-ALL.xml - − update_3/alpha/12.5a6-13.0a1-linux32-ALL.xml - − update_3/alpha/12.5a6-13.0a1-linux64-ALL.xml - − update_3/alpha/12.5a6-13.0a1-macos-ALL.xml - − update_3/alpha/12.5a6-13.0a1-win32-ALL.xml - − update_3/alpha/12.5a6-13.0a1-win64-ALL.xml - − update_3/alpha/12.5a7-13.0a1-linux32-ALL.xml - − update_3/alpha/12.5a7-13.0a1-linux64-ALL.xml - − update_3/alpha/12.5a7-13.0a1-macos-ALL.xml - − update_3/alpha/12.5a7-13.0a1-win32-ALL.xml - − update_3/alpha/12.5a7-13.0a1-win64-ALL.xml - + update_3/alpha/13.0a1-13.0a2-linux32-ALL.xml - + update_3/alpha/13.0a1-13.0a2-linux64-ALL.xml - + update_3/alpha/13.0a1-13.0a2-macos-ALL.xml - + update_3/alpha/13.0a1-13.0a2-win32-ALL.xml - + update_3/alpha/13.0a1-13.0a2-win64-ALL.xml - − update_3/alpha/13.0a1-linux32-ALL.xml - − update_3/alpha/13.0a1-linux64-ALL.xml - − update_3/alpha/13.0a1-macos-ALL.xml - − update_3/alpha/13.0a1-win32-ALL.xml - − update_3/alpha/13.0a1-win64-ALL.xml - + update_3/alpha/13.0a2-linux32-ALL.xml - + update_3/alpha/13.0a2-linux64-ALL.xml - + update_3/alpha/13.0a2-macos-ALL.xml - + update_3/alpha/13.0a2-win32-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] Pushed new tag tbb-13.0a2-build4
by richard (＠richard) 11 Aug '23

11 Aug '23

richard pushed new tag tbb-13.0a2-build4 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40901: Prepare Tor Browser 13.0a2-build4
by richard (＠richard) 11 Aug '23

11 Aug '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: eab7ab80 by Richard Pospesel at 2023-08-11T18:28:28+00:00 Bug 40901: Prepare Tor Browser 13.0a2-build4 - - - - - 2 changed files: - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -43,6 +43,7 @@ Tor Browser 13.0a2 - August 08 2023 * Bug 40867: Create a RBM project for the unified Android repository [tor-browser-build] * Bug 40917: Remove the uniffi-rs project [tor-browser-build] * Bug 41899: Use LLD for Android [tor-browser] + * Bug 40920: Non-deterministic generation of baseline.profm file in Android apks [tor-browser-build] Tor Browser 12.5.2 - July 31 2023 * All Platforms ===================================== rbm.conf ===================================== @@ -82,7 +82,7 @@ buildconf: var: torbrowser_version: '13.0a2' - torbrowser_build: 'build3' + torbrowser_build: 'build4' torbrowser_incremental_from: - '13.0a1' updater_enabled: 1 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40920: Non-deterministic generation of baseline.profm file in Android apks
by richard (＠richard) 11 Aug '23

11 Aug '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: e49c2819 by Richard Pospesel at 2023-08-11T18:13:49+00:00 Bug 40920: Non-deterministic generation of baseline.profm file in Android apks - - - - - 3 changed files: - projects/browser/build.android - projects/browser/config - + projects/browser/sort-baseline.py Changes: ===================================== projects/browser/build.android ===================================== @@ -9,6 +9,11 @@ ext_dir=$assets_dir/extensions qa_apk=[% dest_dir %]/[% c('filename') %]/[% c("var/project-name") %]-[% c("version") %]-[% c("var/osname") %]-multi-qa.apk apk=$rootdir/firefox-android/*-[% c("var/abi") %]-*.apk +# tor-browser-build#40920 +sorted_baseline_apk=$(basename $apk .apk)_sorted_baseline.apk +$rootdir/sort-baseline.py --apk $apk $sorted_baseline_apk +mv $sorted_baseline_apk $apk + # Bundle our extensioni(s). # NoScript will be copied over to the profile folder # as a "regular" browser extension receiving regular AMO updates. ===================================== projects/browser/config ===================================== @@ -151,3 +151,6 @@ input_files: - project: manual name: manual enable: '[% ! c("var/android") && c("var/tor-browser") %]' + # tor-browser-build#40920 + - filename: sort-baseline.py + enable: '[% c("var/android") %]' ===================================== projects/browser/sort-baseline.py ===================================== @@ -0,0 +1,185 @@ +#!/usr/bin/python3 +# encoding: utf-8 +# SPDX-FileCopyrightText: 2023 FC Stegerman <flx(a)obfusk.net> +# SPDX-License-Identifier: GPL-3.0-or-later + +import struct +import zipfile +import zlib + +from typing import Any, Dict, Tuple + +# https://android.googlesource.com/platform/tools/base +# profgen/profgen/src/main/kotlin/com/android/tools/profgen/ArtProfileSerializer.kt + +PROF_MAGIC = b"pro\x00" +PROFM_MAGIC = b"prm\x00" + +PROF_001_N = b"001\x00" +PROF_005_O = b"005\x00" +PROF_009_O_MR1 = b"009\x00" +PROF_010_P = b"010\x00" +PROF_015_S = b"015\x00" + +PROFM_001_N = b"001\x00" +PROFM_002 = b"002\x00" + +ASSET_PROF = "assets/dexopt/baseline.prof" +ASSET_PROFM = "assets/dexopt/baseline.profm" + +ATTRS = ("compress_type", "create_system", "create_version", "date_time", + "external_attr", "extract_version", "flag_bits") +LEVELS = (9, 6, 4, 1) + + +class Error(RuntimeError): + pass + + +# FIXME: is there a better alternative? +class ReproducibleZipInfo(zipfile.ZipInfo): + """Reproducible ZipInfo hack.""" + + if "_compresslevel" not in zipfile.ZipInfo.__slots__: # type: ignore[attr-defined] + raise Error("zipfile.ZipInfo has no ._compresslevel") + + _compresslevel: int + _override: Dict[str, Any] = {} + + def __init__(self, zinfo: zipfile.ZipInfo, **override: Any) -> None: + # pylint: disable=W0231 + if override: + self._override = {**self._override, **override} + for k in self.__slots__: + if hasattr(zinfo, k): + setattr(self, k, getattr(zinfo, k)) + + def __getattribute__(self, name: str) -> Any: + if name != "_override": + try: + return self._override[name] + except KeyError: + pass + return object.__getattribute__(self, name) + + +def sort_baseline(input_file: str, output_file: str) -> None: + with open(input_file, "rb") as fhi: + data = _sort_baseline(fhi.read()) + with open(output_file, "wb") as fho: + fho.write(data) + + +def sort_baseline_apk(input_apk: str, output_apk: str) -> None: + with open(input_apk, "rb") as fh_raw: + with zipfile.ZipFile(input_apk) as zf_in: + with zipfile.ZipFile(output_apk, "w") as zf_out: + for info in zf_in.infolist(): + attrs = {attr: getattr(info, attr) for attr in ATTRS} + zinfo = ReproducibleZipInfo(info, **attrs) + if info.compress_type == 8: + fh_raw.seek(info.header_offset) + n, m = struct.unpack("<HH", fh_raw.read(30)[26:30]) + fh_raw.seek(info.header_offset + 30 + m + n) + ccrc = 0 + size = info.compress_size + while size > 0: + ccrc = zlib.crc32(fh_raw.read(min(size, 4096)), ccrc) + size -= 4096 + with zf_in.open(info) as fh_in: + comps = {lvl: zlib.compressobj(lvl, 8, -15) for lvl in LEVELS} + ccrcs = {lvl: 0 for lvl in LEVELS} + while True: + data = fh_in.read(4096) + if not data: + break + for lvl in LEVELS: + ccrcs[lvl] = zlib.crc32(comps[lvl].compress(data), ccrcs[lvl]) + for lvl in LEVELS: + if ccrc == zlib.crc32(comps[lvl].flush(), ccrcs[lvl]): + zinfo._compresslevel = lvl + break + else: + raise Error(f"Unable to determine compresslevel for {info.filename!r}") + elif info.compress_type != 0: + raise Error(f"Unsupported compress_type {info.compress_type}") + if info.filename == ASSET_PROFM: + print(f"replacing {info.filename!r}...") + zf_out.writestr(zinfo, _sort_baseline(zf_in.read(info))) + else: + with zf_in.open(info) as fh_in: + with zf_out.open(zinfo, "w") as fh_out: + while True: + data = fh_in.read(4096) + if not data: + break + fh_out.write(data) + + +# FIXME +# Supported .prof: none +# Supported .profm: 002 +# Unsupported .profm: 001 N +def _sort_baseline(data: bytes) -> bytes: + magic, data = _split(data, 4) + version, data = _split(data, 4) + if magic == PROF_MAGIC: + raise Error(f"Unsupported prof version {version!r}") + elif magic == PROFM_MAGIC: + if version == PROFM_002: + return PROFM_MAGIC + PROFM_002 + sort_profm_002(data) + else: + raise Error(f"Unsupported profm version {version!r}") + else: + raise Error(f"Unsupported magic {magic!r}") + + +def sort_profm_002(data: bytes) -> bytes: + num_dex_files, uncompressed_data_size, compressed_data_size, data = _unpack("<HII", data) + profiles = [] + if len(data) != compressed_data_size: + raise Error("Compressed data size does not match") + data = zlib.decompress(data) + if len(data) != uncompressed_data_size: + raise Error("Uncompressed data size does not match") + for _ in range(num_dex_files): + profile = data[:4] + profile_idx, profile_key_size, data = _unpack("<HH", data) + profile_key, data = _split(data, profile_key_size) + profile += profile_key + data[:6] + num_type_ids, num_class_ids, data = _unpack("<IH", data) + class_ids, data = _split(data, num_class_ids * 2) + profile += class_ids + profiles.append((profile_key, profile)) + if data: + raise Error("Expected end of data") + srtd = b"".join(int.to_bytes(i, 2, "little") + p[1][2:] + for i, p in enumerate(sorted(profiles))) + cdata = zlib.compress(srtd, 1) + hdr = struct.pack("<HII", num_dex_files, uncompressed_data_size, len(cdata)) + return hdr + cdata + + +def _unpack(fmt: str, data: bytes) -> Any: + assert all(c in "<BHI" for c in fmt) + size = fmt.count("B") + 2 * fmt.count("H") + 4 * fmt.count("I") + return struct.unpack(fmt, data[:size]) + (data[size:],) + + +def _split(data: bytes, size: int) -> Tuple[bytes, bytes]: + return data[:size], data[size:] + + +if __name__ == "__main__": + import argparse + parser = argparse.ArgumentParser(prog="sort-baseline.py") + parser.add_argument("--apk", action="store_true") + parser.add_argument("input_prof_or_apk", metavar="INPUT_PROF_OR_APK") + parser.add_argument("output_prof_or_apk", metavar="OUTPUT_PROF_OR_APK") + args = parser.parse_args() + if args.apk: + sort_baseline_apk(args.input_prof_or_apk, args.output_prof_or_apk) + else: + sort_baseline(args.input_prof_or_apk, args.output_prof_or_apk) + +# vim: set tw=80 sw=4 sts=4 et fdm=marker : View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] Revert "alpha: new version, 13.0a2"
by richard (＠richard) 11 Aug '23

11 Aug '23

richard pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: c58afcb4 by Richard Pospesel at 2023-08-11T01:33:55+00:00 Revert "alpha: new version, 13.0a2" This reverts commit 65ae6dcf728213d058d7741a7c1397a25caaac08. - - - - - 30 changed files: - update_3/alpha/.htaccess - + update_3/alpha/12.5a5-13.0a1-linux32-ALL.xml - + update_3/alpha/12.5a5-13.0a1-linux64-ALL.xml - + update_3/alpha/12.5a5-13.0a1-macos-ALL.xml - + update_3/alpha/12.5a5-13.0a1-win32-ALL.xml - + update_3/alpha/12.5a5-13.0a1-win64-ALL.xml - + update_3/alpha/12.5a6-13.0a1-linux32-ALL.xml - + update_3/alpha/12.5a6-13.0a1-linux64-ALL.xml - + update_3/alpha/12.5a6-13.0a1-macos-ALL.xml - + update_3/alpha/12.5a6-13.0a1-win32-ALL.xml - + update_3/alpha/12.5a6-13.0a1-win64-ALL.xml - + update_3/alpha/12.5a7-13.0a1-linux32-ALL.xml - + update_3/alpha/12.5a7-13.0a1-linux64-ALL.xml - + update_3/alpha/12.5a7-13.0a1-macos-ALL.xml - + update_3/alpha/12.5a7-13.0a1-win32-ALL.xml - + update_3/alpha/12.5a7-13.0a1-win64-ALL.xml - − update_3/alpha/13.0a1-13.0a2-linux32-ALL.xml - − update_3/alpha/13.0a1-13.0a2-linux64-ALL.xml - − update_3/alpha/13.0a1-13.0a2-macos-ALL.xml - − update_3/alpha/13.0a1-13.0a2-win32-ALL.xml - − update_3/alpha/13.0a1-13.0a2-win64-ALL.xml - + update_3/alpha/13.0a1-linux32-ALL.xml - + update_3/alpha/13.0a1-linux64-ALL.xml - + update_3/alpha/13.0a1-macos-ALL.xml - + update_3/alpha/13.0a1-win32-ALL.xml - + update_3/alpha/13.0a1-win64-ALL.xml - − update_3/alpha/13.0a2-linux32-ALL.xml - − update_3/alpha/13.0a2-linux64-ALL.xml - − update_3/alpha/13.0a2-macos-ALL.xml - − update_3/alpha/13.0a2-win32-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] Pushed new tag tbb-13.0a2-build3
by richard (＠richard) 11 Aug '23

11 Aug '23

richard pushed new tag tbb-13.0a2-build3 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40901: Prepare Tor Browser 13.0a2-build3
by richard (＠richard) 11 Aug '23

11 Aug '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: f724d7f9 by Richard Pospesel at 2023-08-10T23:09:50+00:00 Bug 40901: Prepare Tor Browser 13.0a2-build3 fixes tor-browser#41996: App includes com.google.android.gms.permission.AD_ID permission - - - - - 2 changed files: - projects/firefox-android/config - rbm.conf Changes: ===================================== projects/firefox-android/config ===================================== @@ -16,7 +16,7 @@ container: var: fenix_version: 115.2.0 browser_branch: 13.0-1 - browser_build: 3 + browser_build: 4 platform_version: 115.0 variant: Beta # This should be updated when the list of gradle dependencies is changed. ===================================== rbm.conf ===================================== @@ -82,7 +82,7 @@ buildconf: var: torbrowser_version: '13.0a2' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - '13.0a1' updater_enabled: 1 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android] Pushed new tag firefox-android-115.2.0-13.0-1-build4
by richard (＠richard) 11 Aug '23

11 Aug '23

richard pushed new tag firefox-android-115.2.0-13.0-1-build4 at The Tor Project / Applications / firefox-android -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/tree/firef… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.0-13.0-1] fixup! Disable features and functionality
by richard (＠richard) 11 Aug '23

11 Aug '23

richard pushed to branch firefox-android-115.2.0-13.0-1 at The Tor Project / Applications / firefox-android Commits: c0580e65 by Dan Ballard at 2023-08-10T16:28:57-07:00 fixup! Disable features and functionality Bug 41996: Remove android manifest permissions for Google AD_ID - - - - - 3 changed files: - fenix/app/build.gradle - fenix/app/src/main/AndroidManifest.xml - fenix/buildSrc/src/main/java/FenixDependencies.kt Changes: ===================================== fenix/app/build.gradle ===================================== @@ -636,8 +636,6 @@ dependencies { implementation FenixDependencies.adjust implementation FenixDependencies.installreferrer // Required by Adjust - implementation FenixDependencies.google_ads_id // Required for the Google Advertising ID - // Required for in-app reviews implementation FenixDependencies.google_play_review implementation FenixDependencies.google_play_review_ktx ===================================== fenix/app/src/main/AndroidManifest.xml ===================================== @@ -19,9 +19,6 @@ <uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.USE_BIOMETRIC" /> -  - <uses-permission android:name="com.google.android.gms.permission.AD_ID"/> -  <uses-permission-sdk-23 android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> ===================================== fenix/buildSrc/src/main/java/FenixDependencies.kt ===================================== @@ -61,8 +61,6 @@ object FenixVersions { const val uiautomator = "2.2.0" const val robolectric = "4.10.1" - const val google_ads_id_version = "16.0.0" - const val google_play_review_version = "2.0.0" // keep in sync with the versions used in AS. @@ -169,8 +167,6 @@ object FenixDependencies { const val uiautomator = "androidx.test.uiautomator:uiautomator:${FenixVersions.uiautomator}" const val robolectric = "org.robolectric:robolectric:${FenixVersions.robolectric}" - const val google_ads_id = "com.google.android.gms:play-services-ads-identifier:${FenixVersions.google_ads_id_version}" - // Required for in-app reviews const val google_play_review = "com.google.android.play:review:${FenixVersions.google_play_review_version}" const val google_play_review_ktx = "com.google.android.play:review-ktx:${FenixVersions.google_play_review_version}" View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/c05… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/c05… 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, 13.0a2
by richard (＠richard) 10 Aug '23

10 Aug '23

richard pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 65ae6dcf by Richard Pospesel at 2023-08-10T21:01:45+00:00 alpha: new version, 13.0a2 - - - - - 30 changed files: - update_3/alpha/.htaccess - − update_3/alpha/12.5a5-13.0a1-linux32-ALL.xml - − update_3/alpha/12.5a5-13.0a1-linux64-ALL.xml - − update_3/alpha/12.5a5-13.0a1-macos-ALL.xml - − update_3/alpha/12.5a5-13.0a1-win32-ALL.xml - − update_3/alpha/12.5a5-13.0a1-win64-ALL.xml - − update_3/alpha/12.5a6-13.0a1-linux32-ALL.xml - − update_3/alpha/12.5a6-13.0a1-linux64-ALL.xml - − update_3/alpha/12.5a6-13.0a1-macos-ALL.xml - − update_3/alpha/12.5a6-13.0a1-win32-ALL.xml - − update_3/alpha/12.5a6-13.0a1-win64-ALL.xml - − update_3/alpha/12.5a7-13.0a1-linux32-ALL.xml - − update_3/alpha/12.5a7-13.0a1-linux64-ALL.xml - − update_3/alpha/12.5a7-13.0a1-macos-ALL.xml - − update_3/alpha/12.5a7-13.0a1-win32-ALL.xml - − update_3/alpha/12.5a7-13.0a1-win64-ALL.xml - + update_3/alpha/13.0a1-13.0a2-linux32-ALL.xml - + update_3/alpha/13.0a1-13.0a2-linux64-ALL.xml - + update_3/alpha/13.0a1-13.0a2-macos-ALL.xml - + update_3/alpha/13.0a1-13.0a2-win32-ALL.xml - + update_3/alpha/13.0a1-13.0a2-win64-ALL.xml - − update_3/alpha/13.0a1-linux32-ALL.xml - − update_3/alpha/13.0a1-linux64-ALL.xml - − update_3/alpha/13.0a1-macos-ALL.xml - − update_3/alpha/13.0a1-win32-ALL.xml - − update_3/alpha/13.0a1-win64-ALL.xml - + update_3/alpha/13.0a2-linux32-ALL.xml - + update_3/alpha/13.0a2-linux64-ALL.xml - + update_3/alpha/13.0a2-macos-ALL.xml - + update_3/alpha/13.0a2-win32-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][main] Bug 40918: Add the commit hash also when merging AARs.
by richard (＠richard) 10 Aug '23

10 Aug '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: a7137058 by Pier Angelo Vendrame at 2023-08-10T17:24:57+00:00 Bug 40918: Add the commit hash also when merging AARs. We added the commit hashes to GeckoView. However, we might have tested it only with the single-arch testbuilds, because it is not displayed in regular builds. Adding the information also to the mozconfig-android-all makes the commit link available also on them. - - - - - 2 changed files: - projects/geckoview/build - projects/geckoview/merge_aars Changes: ===================================== projects/geckoview/build ===================================== @@ -80,6 +80,9 @@ mkdir "$HOME/.mozbuild" cat >> mozconfig-android-all << 'MOZCONFIG_EOF' ac_add_options --enable-update-channel=[% c("var/channel") %] ac_add_options --with-base-browser-version=[% c("var/torbrowser_version") %] +export MOZ_INCLUDE_SOURCE_INFO=1 +export MOZ_SOURCE_REPO="[% c('var/gitlab_project') %]" +export MOZ_SOURCE_CHANGESET=[% c("var/git_commit") %] MOZCONFIG_EOF pushd tools/torbrowser ===================================== projects/geckoview/merge_aars ===================================== @@ -27,7 +27,12 @@ export MOZ_ANDROID_FAT_AAR_X86_64=$builddir/geckoview/*x86_64*.aar cd $builddir/[% project %]-[% c("version") %] ln -s mozconfig-android-all .mozconfig -echo 'mk_add_options MOZ_PARALLEL_BUILD=[% c("num_procs") %]' >> .mozconfig +cat >> mozconfig-android-all << 'MOZCONFIG_EOF' +mk_add_options MOZ_PARALLEL_BUILD=[% c("num_procs") %] +export MOZ_INCLUDE_SOURCE_INFO=1 +export MOZ_SOURCE_REPO="[% c('var/gitlab_project') %]" +export MOZ_SOURCE_CHANGESET=[% c("var/git_commit") %] +MOZCONFIG_EOF [% c("var/set_MOZ_BUILD_DATE") %] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-13.0a2-build2
by Pier Angelo Vendrame (＠pierov) 10 Aug '23

10 Aug '23

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

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40901: Prepare Tor Browser 13.0a2-build2
by richard (＠richard) 10 Aug '23

10 Aug '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 15afa277 by Pier Angelo Vendrame at 2023-08-10T19:19:11+02:00 Bug 40901: Prepare Tor Browser 13.0a2-build2 - - - - - 3 changed files: - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/firefox-android/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -21,7 +21,9 @@ Tor Browser 13.0a2 - August 08 2023 * Bug 41964: 'emojiAnnotations' not defined in time in connection preferences [tor-browser] * Android * Updated GeckoView to 115.1.0esr + * Bug 40919: Fix nimbus-fml reproducibility of 13.0a2-build1 [tor-browser-build] * Bug 41928: Backport Android-specific security fixes from Firefox 116 to ESR 102.14 / 115.1 - based Tor Browser [tor-browser] + * Bug 41972: Disable Firefox onboarding in 13.0 [tor-browser] * Build System * All Platforms * Updated Go to 1.20.7 @@ -39,6 +41,7 @@ Tor Browser 13.0a2 - August 08 2023 * Bug 31546: Create and expose PDB files for Tor Browser debugging on Windows [tor-browser-build] * Android * Bug 40867: Create a RBM project for the unified Android repository [tor-browser-build] + * Bug 40917: Remove the uniffi-rs project [tor-browser-build] * Bug 41899: Use LLD for Android [tor-browser] Tor Browser 12.5.2 - July 31 2023 ===================================== projects/firefox-android/config ===================================== @@ -16,7 +16,7 @@ container: var: fenix_version: 115.2.0 browser_branch: 13.0-1 - browser_build: 2 + browser_build: 3 platform_version: 115.0 variant: Beta # This should be updated when the list of gradle dependencies is changed. ===================================== rbm.conf ===================================== @@ -82,7 +82,7 @@ buildconf: var: torbrowser_version: '13.0a2' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - '13.0a1' updater_enabled: 1 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40917: Remove the uniffi-rs project.
by richard (＠richard) 10 Aug '23

10 Aug '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 64cb7b18 by Pier Angelo Vendrame at 2023-08-10T16:26:11+00:00 Bug 40917: Remove the uniffi-rs project. We build an old version of uniffi-rs which is consumed only by application-services. However, AS includes a newer version in its Cargo.lock and it is automatically added to the vendor archive, so it can build completely fine also without this project. So, we can remove it. - - - - - 6 changed files: - Makefile - projects/application-services/build - projects/application-services/config - − projects/uniffi-rs/btreeset.patch - − projects/uniffi-rs/build - − projects/uniffi-rs/config Changes: ===================================== Makefile ===================================== @@ -583,9 +583,6 @@ cargo_vendor-application-services: submodule-update cargo_vendor-cbindgen: submodule-update $(rbm) build cbindgen --step cargo_vendor --target alpha --target torbrowser-linux-x86_64 -cargo_vendor-uniffi-rs: submodule-update - $(rbm) build uniffi-rs --step cargo_vendor --target nightly --target torbrowser-linux-x86_64 - go_vendor-snowflake-alpha: submodule-update $(rbm) build snowflake --step go_vendor --target alpha --target torbrowser-linux-x86_64 ===================================== projects/application-services/build ===================================== @@ -21,8 +21,7 @@ mkdir /var/tmp/build cd /var/tmp/dist tar -xf $rootdir/[% c('input_files_by_name/rust') %] tar -xf $rootdir/[% c('input_files_by_name/ninja') %] -tar -xf $rootdir/[% c('input_files_by_name/uniffi-rs') %] -export PATH=/var/tmp/dist/rust/bin:/var/tmp/dist/ninja:/var/tmp/dist/uniffi-rs:$PATH +export PATH=/var/tmp/dist/rust/bin:/var/tmp/dist/ninja:$PATH export RUST_ANDROID_GRADLE_PYTHON_COMMAND=python3 cd $rootdir ===================================== projects/application-services/config ===================================== @@ -46,9 +46,6 @@ steps: - project: ninja name: ninja pkg_type: build - - project: uniffi-rs - name: uniffi-rs - pkg_type: build # See libs/build-all.sh to update these! # Also, build them with application-services, since they need the NDK and # we are using a different one from the other projects. ===================================== projects/uniffi-rs/btreeset.patch deleted ===================================== @@ -1,31 +0,0 @@ -diff --git a/uniffi_bindgen/src/interface/types.rs b/uniffi_bindgen/src/interface/types.rs -index 6448d58..b7efd22 100644 ---- a/uniffi_bindgen/src/interface/types.rs -+++ b/uniffi_bindgen/src/interface/types.rs -@@ -26,7 +26,7 @@ - use anyhow::bail; - use anyhow::Result; - use std::convert::TryFrom; --use std::{collections::hash_map::Entry, collections::HashMap, collections::HashSet}; -+use std::{collections::hash_map::Entry, collections::HashMap, collections::BTreeSet}; - - use super::Attributes; - -@@ -71,7 +71,7 @@ pub enum FFIType { - /// Represents all the different high-level types that can be used in a component interface. - /// At this level we identify user-defined types by name, without knowing any details - /// of their internal structure apart from what type of thing they are (record, enum, etc). --#[derive(Debug, Clone, Eq, PartialEq, Hash)] -+#[derive(Debug, Clone, Eq, PartialEq, Hash, PartialOrd, Ord)] - pub enum Type { - // Primitive types. - UInt8, -@@ -195,7 +195,7 @@ pub(crate) struct TypeUniverse { - // Named type definitions (including aliases). - type_definitions: HashMap<String, Type>, - // All the types in the universe, by canonical type name. -- all_known_types: HashSet<Type>, -+ all_known_types: BTreeSet<Type>, - } - - impl TypeUniverse { ===================================== projects/uniffi-rs/build deleted ===================================== @@ -1,42 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir=/var/tmp/dist -builddir=/var/tmp/build/[% project %] -mkdir -p $distdir/[% project %] -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/rust') %] -export PATH="/var/tmp/dist/rust/bin:$PATH" -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% 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 -xjf uniffi-rs-vendor-[% c('version') %].tar.bz2 -cd $builddir -mkdir .cargo -cat > .cargo/config << 'EOF' -[source.crates-io] -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "/var/tmp/build/uniffi-rs/vendor" -EOF - -# We change the data type of the `all_known_types` Set from HashSet to BTreeSet. -# Uniffi iterates over the elements of this set, and iteration over a HashSet occurs -# in an arbitrary order, while iteration over a BTreeSet orders in a defined (and -# deterministic) order. This patch solves a build reproducibility issue, see -# tor-browser-build#40208. -# -# Upstream bug: https://github.com/mozilla/uniffi-rs/issues/374 -patch -p1 < $rootdir/btreeset.patch -# We usually use --frozen but there is no Cargo.lock file available. Thus resort -# to --offline. -cargo build --release --offline --target x86_64-unknown-linux-gnu -mv target/x86_64-unknown-linux-gnu/release/uniffi-bindgen $distdir/[% project %] - -cd $distdir -[% c('tar', { - tar_src => [ project ], - tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'), - }) %] ===================================== projects/uniffi-rs/config deleted ===================================== @@ -1,27 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 0.7.0 -git_url: https://github.com/mozilla/uniffi-rs -git_hash: ea3ff0402438ef1ebceda4c5fbbbd2ed6a9be227 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' - -container: - use_container: 1 - -input_files: - - project: container-image - - name: rust - project: rust - # Use `make cargo_vendor-uniffi-rs` to re-generate the vendor tarball - - URL: https://people.torproject.org/~boklm/mirrors/sources/uniffi-rs-vendor-[% c('version') %].tar.bz2 - sha256sum: 8f201df618b3e7bcaaf01a87e0d55171605b80abeb1b660fe4dd0b9bfc10a0d8 - - filename: btreeset.patch - -steps: - cargo_vendor: - filename: '[% project %]-vendor-[% c("version") %].tar.bz2' - input_files: - - project: container-image - pkg_type: build - - project: rust - name: rust - pkg_type: build View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40919: Fix nimbus-fml reproducibility problems.
by richard (＠richard) 10 Aug '23

10 Aug '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 8f52ed5f by Pier Angelo Vendrame at 2023-08-10T10:05:42+02:00 Bug 40919: Fix nimbus-fml reproducibility problems. - - - - - 1 changed file: - projects/application-services/bug40485.diff Changes: ===================================== projects/application-services/bug40485.diff ===================================== @@ -1,5 +1,31 @@ +diff --git a/components/support/nimbus-fml/src/intermediate_representation.rs b/components/support/nimbus-fml/src/intermediate_representation.rs +index e61f8a728..c1e396cab 100644 +--- a/components/support/nimbus-fml/src/intermediate_representation.rs ++++ b/components/support/nimbus-fml/src/intermediate_representation.rs +@@ -8,7 +8,7 @@ use crate::util::loaders::FilePath; + use anyhow::{bail, Error, Result as AnyhowResult}; + use serde::{Deserialize, Serialize}; + use serde_json::{Map, Value}; +-use std::collections::{BTreeSet, HashMap, HashSet}; ++use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet}; + use std::fmt::Display; + use std::slice::Iter; + +@@ -191,10 +191,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 bb676f827..d00b1b6ef 100644 +index bb676f827..0d7e78583 100644 --- a/components/support/nimbus-fml/src/parser.rs +++ b/components/support/nimbus-fml/src/parser.rs @@ -26,7 +26,7 @@ pub(crate) struct EnumVariantBody { @@ -41,6 +67,33 @@ index bb676f827..d00b1b6ef 100644 #[serde(default)] #[serde(alias = "include")] +@@ -785,7 +785,7 @@ impl Parser { + &self, + current: &FilePath, + channel: &str, +- imports: &mut HashMap<ModuleId, FeatureManifest>, ++ imports: &mut BTreeMap<ModuleId, FeatureManifest>, + ) -> Result<ModuleId> { + let id = current.try_into()?; + if imports.contains_key(&id) { +@@ -814,7 +814,7 @@ impl Parser { + // This loop does the work of merging the default blocks back into the imported manifests. + // We'll then attach all the manifests to the root (i.e. the one we're generating code for today), in `imports`. + // 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. +@@ -888,7 +888,7 @@ impl Parser { + &self, + channel: &str, + ) -> Result<FeatureManifest, FMLError> { +- let mut manifests = HashMap::new(); ++ let mut manifests = BTreeMap::new(); + let id = self.load_imports(&self.source, channel, &mut manifests)?; + let mut fm = manifests + .remove(&id) @@ -1009,12 +1009,12 @@ impl Parser { } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… 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-13.0a2-build1
by richard (＠richard) 09 Aug '23

09 Aug '23

richard pushed new tag mb-13.0a2-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

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-13.0a2-build1
by richard (＠richard) 09 Aug '23

09 Aug '23

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

1 0

[Git][tpo/applications/tor-browser-build][main] 4 commits: Bug 40908: Enable the --enable-gpl config flag in tor to bring in PoW functionality
by richard (＠richard) 09 Aug '23

09 Aug '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: ec97c9d3 by Richard Pospesel at 2023-08-09T12:38:17+02:00 Bug 40908: Enable the --enable-gpl config flag in tor to bring in PoW functionality - - - - - 9f038fb2 by Nicolas Vigier at 2023-08-09T12:38:19+02:00 Bug 40916: Pull Mullvad mar files from archive.torproject.org In order to generate incrementals, get mar files from the previous version from archive.tpo instead of the Mullvad mirrors, since that release is not always there but should always be on archive.tpo. - - - - - da34986c by Pier Angelo Vendrame at 2023-08-09T17:14:21+02:00 MB 199 (fix): Use -L to copy Mullvad Browser's Fluent files. We need to use the -L option when copying MB's Fluent files because on macOS we symlink ja-JP-mac to ja. - - - - - c70c38d5 by Richard Pospesel at 2023-08-09T17:16:07+02:00 Bug 40901, 40902: Prepare Tor+Mullvad Browser Alpha 13.0a2 - - - - - 15 changed files: - projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/allowed_addons.json - projects/browser/config - projects/firefox-android/config - projects/firefox/build - projects/firefox/config - projects/geckoview/config - projects/go/config - projects/openssl/config - projects/release/update_responses_config.yml - projects/tor/build - projects/tor/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== @@ -1,3 +1,37 @@ +Mullvad Browser 13.0a2 - August 08 2023 + * All Platforms + * Updated NoScript to 11.4.26 + * Upated uBlock Origin to 1.51.0 + * Updated Firefox to 115.1.0esr + * Bug 195: Choose which locales to translate Mullvad Browser to [mullvad-browser] + * Bug 216: Rebase Mullvad Browser onto 115.1.0esr [mullvad-browser] + * Bug 30556: Re-evaluate letterboxing dimension choices [tor-browser] + * Bug 33282: Increase the max width of new windows [tor-browser] + * Bug 40916: Update updated_responses_config.yml to pull Mullvad incrementals from archive.torproject.org [tor-browser-build] + * Build System + * All Platforms + * Bug 198: Enable localization for Mullvad Browser builds [mullvad-browser] + * Bug 199: Mullvad Browser changes required to use Mullvad Browser-specific localization strings [mullvad-browser] + * Bug 40615: Consider adding a readme to the fonts directory [tor-browser-build] + * Bug 40880: The README doesn't include some dependencies needed for building incrementals [tor-browser-build] + * Bug 40907: Mar-tools aren't deterministic on 13.0a1 [tor-browser-build] + * Bug 40909: Add dan_b and ma1 to list of taggers in relevant projects [tor-browser-build] + * Bug 40913: add boklm back to list of taggers in relevant projects [tor-browser-build] + +Mullvad Browser 12.5.2 - July 31 2023 + * All Platforms + * Updated NoScript to 11.4.26 + * Upated uBlock Origin to 1.51.0 + * Updated Firefox to 102.14.0esr + * Bug 217: Rebase Mullvad Browser 12.5 stable on top of 102.14esr [mullvad-browser] + * Build System + * All Platforms + * Bug 40889: Add mullvad sha256sums URL to tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo [tor-browser-build] + * Bug 40894: Fix format of keyring/boklm.gpg [tor-browser-build] + * Bug 40909: Add dan_b and ma1 to list of taggers in relevant projects [tor-browser-build] + * Windows + * Bug 31546: Create and expose PDB files for Tor Browser debugging on Windows [tor-browser-build] + Mullvad Browser 13.0a1 - July 20 2023 * All Platforms * Updated NoScript to 11.4.25 ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,67 @@ +Tor Browser 13.0a2 - August 08 2023 + * All Platforms + * Updated Translations + * Updated NoScript to 11.4.26 + * Updated OpenSSL to 3.0.10 + * Updated tor to 0.4.8.3-rc + * Bug 41909: Rebase 13.0 alpha to 115.1.0 esr [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 115.1.0esr + * Bug 30556: Re-evaluate letterboxing dimension choices [tor-browser] + * Bug 33282: Increase the max width of new windows [tor-browser] + * Bug 40982: Cleanup maps in tor-circuit-display [tor-browser] + * Bug 40983: Move not UI-related torbutton.js code to modules [tor-browser] + * Bug 41844: Stop using the control port directly [tor-browser] + * Bug 41907: The bootstrap is interrupted without any errors if the process becomes ready when already bootstrapping [tor-browser] + * Bug 41922: Unify the bridge line parsers [tor-browser] + * Bug 41923: The path normalization results in warnings [tor-browser] + * Bug 41924: Small refactors for TorProcess [tor-browser] + * Bug 41925: Remove the torbutton startup process [tor-browser] + * Bug 41926: Refactor the control port client implementation [tor-browser] + * Bug 41964: 'emojiAnnotations' not defined in time in connection preferences [tor-browser] + * Android + * Updated GeckoView to 115.1.0esr + * Bug 41928: Backport Android-specific security fixes from Firefox 116 to ESR 102.14 / 115.1 - based Tor Browser [tor-browser] + * Build System + * All Platforms + * Updated Go to 1.20.7 + * Bug 31588: Be smarter about vendoring for Rust projects [tor-browser-build] + * Bug 40855: Update toolchains for Mozilla 115 [tor-browser-build] + * Bug 40880: The README doesn't include some dependencies needed for building incrementals [tor-browser-build] + * Bug 40905: Go vendor archives ignore the nightly version override on testbuilds [tor-browser-build] + * Bug 40908: Enable the --enable-gpl config flag in tor to bring in PoW functionality [tor-browser-build] + * Bug 40909: Add dan_b and ma1 to list of taggers in relevant projects [tor-browser-build] + * Bug 40913: add boklm back to list of taggers in relevant projects [tor-browser-build] + * Windows + macOS + Linux + * Bug 40615: Consider adding a readme to the fonts directory [tor-browser-build] + * Bug 40907: Mar-tools aren't deterministic on 13.0a1 [tor-browser-build] + * Windows + * Bug 31546: Create and expose PDB files for Tor Browser debugging on Windows [tor-browser-build] + * Android + * Bug 40867: Create a RBM project for the unified Android repository [tor-browser-build] + * Bug 41899: Use LLD for Android [tor-browser] + +Tor Browser 12.5.2 - July 31 2023 + * All Platforms + * Updated Translations + * Updated NoScript to 11.4.26 + * Bug 41908: Rebase stable 12.5 to 102.14esr [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 102.14.0esr + * Windows + * Bug 41761: xul.dll win crash tor-browser 12.5.1 (based on Mozilla Firefox 102.13.0esr) (64-Bit) [tor-browser] + * Android + * Updated GeckoView to 102.14.0esr + * Bug 41928: Backport Android-specific security fixes from Firefox 116 to ESR 102.14 / 115.1 - based Tor Browser [tor-browser] + * Build System + * All Platforms + * Updated Go to 1.20.6 + * Bug 40889: Add mullvad sha256sums URL to tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo [tor-browser-build] + * Bug 40894: Fix format of keyring/boklm.gpg [tor-browser-build] + * Bug 40909: Add dan_b and ma1 to list of taggers in relevant projects [tor-browser-build] + * Windows + * Bug 31546: Create and expose PDB files for Tor Browser debugging on Windows [tor-browser-build] + Tor Browser 13.0a1 - July 20 2023 * All Platforms * Updated Translations ===================================== projects/browser/allowed_addons.json ===================================== @@ -17,7 +17,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…" } ], - "average_daily_users": 962293, + "average_daily_users": 963152, "categories": { "android": [ "experimental", @@ -221,10 +221,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5599, - "bayesian_average": 4.558742718876036, - "count": 5081, - "text_count": 1597 + "average": 4.5592, + "bayesian_average": 4.55804261202379, + "count": 5093, + "text_count": 1604 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", "requires_payment": false, @@ -321,7 +321,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/", - "weekly_downloads": 23021 + "weekly_downloads": 24659 }, "notes": null }, @@ -337,7 +337,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…" } ], - "average_daily_users": 249664, + "average_daily_users": 249415, "categories": { "android": [ "security-privacy" @@ -553,9 +553,9 @@ "category": "recommended" }, "ratings": { - "average": 4.8163, - "bayesian_average": 4.811654069453744, - "count": 1350, + "average": 4.816, + "bayesian_average": 4.811352368325867, + "count": 1353, "text_count": 238 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", @@ -641,7 +641,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/", - "weekly_downloads": 3297 + "weekly_downloads": 3670 }, "notes": null }, @@ -657,7 +657,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 1077131, + "average_daily_users": 1076698, "categories": { "android": [ "security-privacy" @@ -1180,9 +1180,9 @@ "category": "recommended" }, "ratings": { - "average": 4.8004, - "bayesian_average": 4.797633164122742, - "count": 2259, + "average": 4.8009, + "bayesian_average": 4.798135100629341, + "count": 2265, "text_count": 431 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", @@ -1207,7 +1207,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/", - "weekly_downloads": 17147 + "weekly_downloads": 18718 }, "notes": null }, @@ -1223,7 +1223,7 @@ "picture_url": null } ], - "average_daily_users": 6213889, + "average_daily_users": 6229783, "categories": { "android": [ "security-privacy" @@ -1388,7 +1388,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-07-25T13:50:33Z", + "last_updated": "2023-08-07T17:15:41Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1533,10 +1533,10 @@ "category": "recommended" }, "ratings": { - "average": 4.782, - "bayesian_average": 4.781604256114891, - "count": 15731, - "text_count": 4091 + "average": 4.7828, + "bayesian_average": 4.782404807048353, + "count": 15798, + "text_count": 4101 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1598,7 +1598,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/", - "weekly_downloads": 129273 + "weekly_downloads": 143905 }, "notes": null }, @@ -1614,7 +1614,7 @@ "picture_url": null } ], - "average_daily_users": 167699, + "average_daily_users": 167376, "categories": { "android": [ "photos-media" @@ -1713,10 +1713,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4916, - "bayesian_average": 4.486471885365025, - "count": 1129, - "text_count": 422 + "average": 4.4929, + "bayesian_average": 4.487789225993283, + "count": 1132, + "text_count": 423 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", "requires_payment": false, @@ -1738,7 +1738,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…", - "weekly_downloads": 367 + "weekly_downloads": 328 }, "notes": null }, @@ -1754,7 +1754,7 @@ "picture_url": null } ], - "average_daily_users": 85522, + "average_daily_users": 85334, "categories": { "android": [ "experimental", @@ -1892,7 +1892,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/", - "weekly_downloads": 1659 + "weekly_downloads": 1565 }, "notes": null }, @@ -1908,7 +1908,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…" } ], - "average_daily_users": 257323, + "average_daily_users": 257984, "categories": { "android": [ "photos-media", @@ -2127,10 +2127,10 @@ "category": "recommended" }, "ratings": { - "average": 4.652, - "bayesian_average": 4.647356910324775, - "count": 1296, - "text_count": 249 + "average": 4.6539, + "bayesian_average": 4.64926734511088, + "count": 1303, + "text_count": 250 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", "requires_payment": false, @@ -2151,7 +2151,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/", - "weekly_downloads": 4065 + "weekly_downloads": 4027 }, "notes": null }, @@ -2174,7 +2174,7 @@ "picture_url": null } ], - "average_daily_users": 111166, + "average_daily_users": 111124, "categories": { "android": [ "other" @@ -2457,10 +2457,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4202, - "bayesian_average": 4.41559222474328, - "count": 1228, - "text_count": 332 + "average": 4.4123, + "bayesian_average": 4.407708861807205, + "count": 1232, + "text_count": 334 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", "requires_payment": false, @@ -2480,7 +2480,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/", - "weekly_downloads": 33 + "weekly_downloads": 30 }, "notes": null }, @@ -2496,7 +2496,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…" } ], - "average_daily_users": 301822, + "average_daily_users": 301669, "categories": { "android": [ "performance", @@ -2686,10 +2686,10 @@ "category": "recommended" }, "ratings": { - "average": 4.404, - "bayesian_average": 4.401301959464707, - "count": 2089, - "text_count": 810 + "average": 4.4047, + "bayesian_average": 4.402001757843669, + "count": 2093, + "text_count": 811 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", "requires_payment": false, @@ -2733,7 +2733,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/", - "weekly_downloads": 7807 + "weekly_downloads": 7783 }, "notes": null }, @@ -2749,7 +2749,7 @@ "picture_url": null } ], - "average_daily_users": 149721, + "average_daily_users": 150191, "categories": { "android": [ "performance", @@ -2864,9 +2864,9 @@ "category": "recommended" }, "ratings": { - "average": 3.9005, - "bayesian_average": 3.89624887816371, - "count": 1146, + "average": 3.9015, + "bayesian_average": 3.8972613162211953, + "count": 1147, "text_count": 406 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", @@ -2886,7 +2886,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…", - "weekly_downloads": 1670 + "weekly_downloads": 1838 }, "notes": null } ===================================== projects/browser/config ===================================== @@ -104,9 +104,9 @@ input_files: - URL: https://addons.mozilla.org/firefox/downloads/file/4141345/noscript-11.4.26.… name: noscript sha256sum: 283db0eaebbd2888c1a852f5acabaa8e0225ff1eb1a97a25bceaedfd14d9f44c - - URL: https://addons.mozilla.org/firefox/downloads/file/4121906/ublock_origin-1.5… + - URL: https://addons.mozilla.org/firefox/downloads/file/4141256/ublock_origin-1.5… name: ublock-origin - sha256sum: 10618003e70b528c3f17996e373146d39e6b15f777ac4ca1f214da2ffdb7a5b3 + sha256sum: 8b73468bc233a11dd2895219466381783d19123857dd0b6fd16a01820fca4834 enable: '[% c("var/mullvad-browser") %]' - URL: https://github.com/mullvad/browser-extension/releases/download/v0.8.3-firef… name: mullvad-extension ===================================== projects/firefox-android/config ===================================== @@ -16,7 +16,7 @@ container: var: fenix_version: 115.2.0 browser_branch: 13.0-1 - browser_build: 1 + browser_build: 2 platform_version: 115.0 variant: Beta # This should be updated when the list of gradle dependencies is changed. ===================================== projects/firefox/build ===================================== @@ -159,7 +159,7 @@ mkdir "$HOME/.mozbuild" pushd "$rootdir/translation-mullvad-browser" ln -s ja ja-JP-mac for lang in $supported_locales; do - cp -r $lang "$l10ncentral/" + cp -Lr $lang "$l10ncentral/" done popd [% END -%] ===================================== projects/firefox/config ===================================== @@ -14,11 +14,11 @@ container: use_container: 1 var: - firefox_platform_version: 115.0.2 + firefox_platform_version: 115.1.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '13.0' browser_branch: '[% c("var/browser_series") %]-1' - browser_build: 3 + browser_build: 4 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' @@ -85,7 +85,7 @@ targets: git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git var: branding_directory_prefix: 'mb' - browser_build: 2 + browser_build: 3 gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser linux-x86_64: ===================================== projects/geckoview/config ===================================== @@ -16,7 +16,7 @@ container: var: geckoview_version: 115.1.0esr browser_branch: 13.0-1 - browser_build: 2 + browser_build: 4 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse HEAD") %]' ===================================== projects/go/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.20.6 +version: 1.20.7 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -119,7 +119,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 62ee5bc6fb55b8bae8f705e0cb8df86d6453626b4ecf93279e2867092e0b7f70 + sha256sum: 2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597 - project: go-bootstrap name: go-bootstrap target_replace: ===================================== projects/openssl/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 3.0.9 +version: 3.0.10 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -33,4 +33,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90 + sha256sum: 1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323 ===================================== projects/release/update_responses_config.yml ===================================== @@ -10,13 +10,12 @@ appname_bundle_win64: '[% c("var/projectname") %]-install-win64' releases_dir: [% path(c('output_dir')) %][% IF ! c("var/nightly") %]/signed[% END %] download: gpg_keyring: ../../keyring/torbrowser.gpg + archive_url: 'https://archive.torproject.org/tor-package-archive/[% c("var/projectname") %]' [% IF c("var/tor-browser") -%] - archive_url: 'https://archive.torproject.org/tor-package-archive/torbrowser' bundles_url: 'https://dist.torproject.org/torbrowser' mars_url: 'https://cdn.torproject.org/aus1/torbrowser' [% END -%] [% IF c("var/mullvad-browser") -%] - archive_url: 'https://cdn.mullvad.net/browser' bundles_url: 'https://cdn.mullvad.net/browser' mars_url: 'https://cdn.mullvad.net/browser' [% END -%] ===================================== projects/tor/build ===================================== @@ -73,7 +73,7 @@ find -type f -print0 | xargs -0 [% c("touch") %] [% IF c("var/windows") || c("var/android") %]--with-zlib-dir="$zlibdir"[% END %] \ [% IF c("var/macos") %]--enable-static-openssl[% END %] \ [% IF c("var/windows") %]--enable-static-libevent --enable-static-openssl --enable-static-zlib[% END %] \ - --prefix="$distdir" [% c("var/configure_opt") %] + --enable-gpl --prefix="$distdir" [% c("var/configure_opt") %] [% IF c("var/macos") -%] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" ===================================== projects/tor/config ===================================== @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' -version: 0.4.8.2-alpha +version: 0.4.8.3-rc git_hash: 'tor-[% c("version") %]' git_url: https://gitlab.torproject.org/tpo/core/tor.git git_submodule: 1 ===================================== projects/translation/config ===================================== @@ -12,19 +12,19 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: 060d9d04b3a4c3e0f09f3f5fa8ad3ab12e2f4e80 + git_hash: f940956c425c199f622f53fef9a735fc303b11f1 targets: nightly: git_hash: 'base-browser' base-browser-fluent: base-browser-fluent: '[% INCLUDE build %]' - git_hash: 6f64004400616a5956d1823a0e8176b60d212090 + git_hash: 72c0d47f55994b6d68e0239d9edd02d7ae7708ab targets: nightly: git_hash: 'basebrowser-newidentityftl' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: d8d2b8f3200aa309f44f2fa80625ff8e6a25bb78 + git_hash: 2b885b2a6dfeaa046678133755639d6e26485754 targets: nightly: git_hash: 'tor-browser' ===================================== rbm.conf ===================================== @@ -81,12 +81,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '13.0a1' + torbrowser_version: '13.0a2' torbrowser_build: 'build1' torbrowser_incremental_from: - - 12.5a5 - - 12.5a6 - - 12.5a7 + - '13.0a1' updater_enabled: 1 build_mar: 1 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' @@ -302,9 +300,6 @@ targets: - tr - zh-CN - zh-TW - torbrowser_build: 'build2' - torbrowser_incremental_from: - - 12.5a7 torbrowser-testbuild: - testbuild 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-115.1.0esr-13.0-1-build4
by richard (＠richard) 09 Aug '23

09 Aug '23

richard pushed new tag tor-browser-115.1.0esr-13.0-1-build4 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-build][main] MB 198: Enable additional languages on Mullvad Browser.
by Pier Angelo Vendrame (＠pierov) 08 Aug '23

08 Aug '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: a93cb13f by Pier Angelo Vendrame at 2023-08-08T18:09:08+02:00 MB 198: Enable additional languages on Mullvad Browser. Also MB 199: Inject Mullvad Browser-specific localized strings in projects/firefox. - - - - - 5 changed files: - .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md - projects/firefox/build - projects/firefox/config - projects/translation/config - rbm.conf Changes: ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md ===================================== @@ -47,6 +47,7 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch - [ ] run `make list_translation_updates-alpha` to get updated hashes - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch - [ ] `steps/base-browser-fluent/git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch + - [ ] `steps/mullvad-browser/git_hash` : update with `HEAD` commit of project's `mullvad-browser` branch - [ ] Update common build configs - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/browser/config` ===================================== projects/firefox/build ===================================== @@ -154,6 +154,14 @@ mkdir "$HOME/.mozbuild" echo "% locale torbutton $lang %locale/$lang/" >> "$torbutton_jar" echo " locale/$lang (chrome/locale/$lang/*)" >> "$torbutton_jar" done + [% ELSIF c("var/mullvad-browser") -%] + tar -C "$rootdir" -xf "$rootdir/[% c('input_files_by_name/translation-mullvad-browser') %]" + pushd "$rootdir/translation-mullvad-browser" + ln -s ja ja-JP-mac + for lang in $supported_locales; do + cp -r $lang "$l10ncentral/" + done + popd [% END -%] [% ELSE -%] supported_locales="" ===================================== projects/firefox/config ===================================== @@ -199,6 +199,10 @@ input_files: name: translation-tor-browser pkg_type: tor-browser enable: '[% c("var/tor-browser") && c("var/has_l10n") %]' + - project: translation + name: translation-mullvad-browser + pkg_type: mullvad-browser + enable: '[% c("var/mullvad-browser") && c("var/has_l10n") %]' - filename: marsigner.der enable: '[% c("var/override_updater_url") %]' - filename: namecoin-torbutton.patch ===================================== projects/translation/config ===================================== @@ -28,6 +28,12 @@ steps: targets: nightly: git_hash: 'tor-browser' + mullvad-browser: + mullvad-browser: '[% INCLUDE build %]' + git_hash: 1f736c5ae157f27df975c18bf3f2fa5f4bb5e33a + targets: + nightly: + git_hash: 'mullvad-browser' fenix: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch @@ -40,7 +46,7 @@ steps: list_updates: list_updates: | [% - FOREACH component = [ 'base-browser', 'base-browser-fluent', 'tor-browser', 'fenix' ]; + FOREACH component = [ 'base-browser', 'base-browser-fluent', 'tor-browser', 'mullvad-browser', 'fenix' ]; branch = pc(project, 'git_hash', { step => component, target => [ 'nightly' ] }); commit_hash = exec('git rev-parse ' _ branch, { git_hash => branch }); IF commit_hash == pc(project, "git_hash", { step => component }); ===================================== rbm.conf ===================================== @@ -280,7 +280,28 @@ targets: ProjectName: MullvadBrowser exe_name: mullvadbrowser mar_channel_id: '[% c("var/projectname") %]-mullvad-[% c("var/channel") %]' - locales: [] + locales: + - ar + - da + - de + - es-ES + - fa + - fi + - fr + - it + - '[% c("var/locale_ja") %]' + - ko + - my + - nb-NO + - nl + - pl + - pt-BR + - ru + - sv-SE + - th + - tr + - zh-CN + - zh-TW torbrowser_build: 'build2' torbrowser_incremental_from: - 12.5a7 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… You're receiving this email because of your account on gitlab.torproject.org.

1 0