lists.torproject.org
Sign In Sign Up
Manage this list Sign In Sign Up

Keyboard Shortcuts

Thread View

  • j: Next unread message
  • k: Previous unread message
  • j a: Jump to all threads
  • j l: Jump to MailingList overview

tbb-commits

Thread Start a new thread
Download
Threads by month
  • ----- 2025 -----
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2024 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2023 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2022 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2021 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2020 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2019 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2018 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2017 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2016 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2015 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2014 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
tbb-commits@lists.torproject.org

  • 1 participants
  • 18712 discussions
[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
0 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
0 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
0 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
0 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
0 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
0 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
0 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
0 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 &quot;alpha: new version, 13.0a2&quot; 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
0 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
0 0
  • ← Newer
  • 1
  • ...
  • 384
  • 385
  • 386
  • 387
  • 388
  • 389
  • 390
  • ...
  • 1872
  • Older →

HyperKitty Powered by HyperKitty version 1.3.12.