- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to...
by Richard Pospesel (＠richard) 30 Jan '23

30 Jan '23

Richard Pospesel pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 3bc6973c by ahochheiden at 2023-01-30T17:13:50+01:00 Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to ensure Python3.11 compatibility r=firefox-build-system-reviewers,glandium a=RyanVM The 'U' flag represents "universal newline". It has been deprecated since Python3.3. Since then "universal newline" is the default when a file is opened in text mode (not bytes). In Python3.11 using the 'U' flag throws errors. There should be no harm in removing 'U' from 'open' everywhere it is used, and doing allows the use of Python3.11. For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api Differential Revision: https://phabricator.services.mozilla.com/D147721 - - - - - 6 changed files: - dom/base/usecounters.py - python/mozbuild/mozbuild/action/process_define_files.py - python/mozbuild/mozbuild/backend/base.py - python/mozbuild/mozbuild/preprocessor.py - python/mozbuild/mozbuild/util.py - python/mozbuild/mozpack/files.py Changes: ===================================== dom/base/usecounters.py ===================================== @@ -8,7 +8,7 @@ import re def read_conf(conf_filename): # Can't read/write from a single StringIO, so make a new one for reading. - stream = open(conf_filename, "rU") + stream = open(conf_filename, "r") def parse_counters(stream): for line_num, line in enumerate(stream): ===================================== python/mozbuild/mozbuild/action/process_define_files.py ===================================== @@ -36,7 +36,7 @@ def process_define_file(output, input): ) and not config.substs.get("JS_STANDALONE"): config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src")) - with open(path, "rU") as input: + with open(path, "r") as input: r = re.compile( "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U ) ===================================== python/mozbuild/mozbuild/backend/base.py ===================================== @@ -272,7 +272,7 @@ class BuildBackend(LoggingMixin): return status @contextmanager - def _write_file(self, path=None, fh=None, readmode="rU"): + def _write_file(self, path=None, fh=None, readmode="r"): """Context manager to write a file. This is a glorified wrapper around FileAvoidWrite with integration to ===================================== python/mozbuild/mozbuild/preprocessor.py ===================================== @@ -531,7 +531,7 @@ class Preprocessor: if args: for f in args: - with io.open(f, "rU", encoding="utf-8") as input: + with io.open(f, "r", encoding="utf-8") as input: self.processFile(input=input, output=out) if depfile: mk = Makefile() @@ -860,7 +860,7 @@ class Preprocessor: args = self.applyFilters(args) if not os.path.isabs(args): args = os.path.join(self.curdir, args) - args = io.open(args, "rU", encoding="utf-8") + args = io.open(args, "r", encoding="utf-8") except Preprocessor.Error: raise except Exception: @@ -914,7 +914,7 @@ class Preprocessor: def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"): pp = Preprocessor(defines=defines, marker=marker) for f in includes: - with io.open(f, "rU", encoding="utf-8") as input: + with io.open(f, "r", encoding="utf-8") as input: pp.processFile(input=input, output=output) return pp.includes ===================================== python/mozbuild/mozbuild/util.py ===================================== @@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO): still occur, as well as diff capture if requested. """ - def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"): + def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"): BytesIO.__init__(self) self.name = filename assert type(capture_diff) == bool ===================================== python/mozbuild/mozpack/files.py ===================================== @@ -554,7 +554,7 @@ class PreprocessedFile(BaseFile): pp = Preprocessor(defines=self.defines, marker=self.marker) pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings) - with _open(self.path, "rU") as input: + with _open(self.path, "r") as input: with _open(os.devnull, "w") as output: pp.processFile(input=input, output=output) @@ -611,7 +611,7 @@ class PreprocessedFile(BaseFile): pp = Preprocessor(defines=self.defines, marker=self.marker) pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings) - with _open(self.path, "rU") as input: + with _open(self.path, "r") as input: pp.processFile(input=input, output=dest, depfile=deps_out) dest.close() View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3bc6973… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3bc6973… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] 2 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 30 Jan '23

30 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 43da6d54 by Pier Angelo Vendrame at 2023-01-30T14:40:42+01:00 fixup! Firefox preference overrides. Bug 40788: Disable AS's calls to home. We now also disable more AS tasks, but we could see it as a part of the preferences we set to be sure it stays disabled. - - - - - e8921475 by Pier Angelo Vendrame at 2023-01-30T14:41:32+01:00 Bug 40788: Prevent nsIURLQueryStrippingListService from calling home when it is not enabled. The URL query stripping service is enabled only in nightly builds, still it is initialized and remote settings are downloaded. This adds a condition that prevents the service from being initialized if disabled. Upstream Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1812594 We should remove this patch if Mozilla decides that this is a problem also for them, or if they do not but we decide to use the feature. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - browser/components/BrowserGlue.jsm Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -178,6 +178,15 @@ pref("browser.newtabpage.activity-stream.default.sites", ""); pref("browser.newtabpage.activity-stream.feeds.telemetry", false); pref("browser.newtabpage.activity-stream.telemetry", false); +// tor-browser#40788: disable AS's calls to home. +// Notice that null is between quotes because it is a JSON string. +// Keep checked firefox.js to see if new entries are added. +pref("browser.newtabpage.activity-stream.asrouter.providers.cfr", "null"); +pref("browser.newtabpage.activity-stream.asrouter.providers.whats-new-panel", "null"); +pref("browser.newtabpage.activity-stream.asrouter.providers.message-groups", "null"); +pref("browser.newtabpage.activity-stream.asrouter.providers.snippets", "null"); +pref("browser.newtabpage.activity-stream.asrouter.providers.messaging-experiments", "null"); + // Disable fetching asrouter.ftl and related console errors (tor-browser#40763). pref("browser.newtabpage.activity-stream.asrouter.useRemoteL10n", false); ===================================== browser/components/BrowserGlue.jsm ===================================== @@ -2698,11 +2698,23 @@ BrowserGlue.prototype = { { task: () => { - // Init the url query stripping list. - let urlQueryStrippingListService = Cc[ - "@mozilla.org/query-stripping-list-service;1" - ].getService(Ci.nsIURLQueryStrippingListService); - urlQueryStrippingListService.init(); + // tor-browser#40788: Do not initialize + // nsIURLQueryStrippingListService to prevent it from initializing + // its remote settings if it's disabled. + // See also https://bugzilla.mozilla.org/show_bug.cgi?id=1812594 + let enabledPref = "privacy.query_stripping.enabled"; + let enabledPBMPref = "privacy.query_stripping.enabled.pbmode"; + + if ( + Services.prefs.getBoolPref(enabledPref, false) || + Services.prefs.getBoolPref(enabledPBMPref, false) + ) { + // Init the url query stripping list. + let urlQueryStrippingListService = Cc[ + "@mozilla.org/query-stripping-list-service;1" + ].getService(Ci.nsIURLQueryStrippingListService); + urlQueryStrippingListService.init(); + } }, }, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/31831f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/31831f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 30 Jan '23

30 Jan '23

Pier Angelo Vendrame pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 073b5c5d by Pier Angelo Vendrame at 2023-01-30T13:13:30+00:00 fixup! Firefox preference overrides. Bug 41595: Disable page thumbnails (cherry picked from commit 31831ff2e86470fced54745acc28fd0cbfcea23e) - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -55,6 +55,9 @@ pref("media.memory_cache_max_size", 16384); // Disable restore in case of crash (tor-browser#41503) // This should not be needed in PBM, but we added it anyway like other options. pref("browser.sessionstore.resume_from_crash", false); +// Disable capturing thumbnails (tor-browser#41595) +// Also not needed in PBM at the moment. +pref("browser.pagethumbnails.capturing_disabled", true); // Enable HTTPS-Only mode (tor-browser#19850) pref("dom.security.https_only_mode", true); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/073b5c5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/073b5c5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 30 Jan '23

30 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 31831ff2 by Pier Angelo Vendrame at 2023-01-30T10:34:17+01:00 fixup! Firefox preference overrides. Bug 41595: Disable page thumbnails - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -55,6 +55,9 @@ pref("media.memory_cache_max_size", 16384); // Disable restore in case of crash (tor-browser#41503) // This should not be needed in PBM, but we added it anyway like other options. pref("browser.sessionstore.resume_from_crash", false); +// Disable capturing thumbnails (tor-browser#41595) +// Also not needed in PBM at the moment. +pref("browser.pagethumbnails.capturing_disabled", true); // Enable HTTPS-Only mode (tor-browser#19850) pref("dom.security.https_only_mode", true); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/31831ff… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/31831ff… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.5-1] 5 commits: fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (＠pierov) 26 Jan '23

26 Jan '23

Pier Angelo Vendrame pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 0ee79644 by cypherpunks1 at 2023-01-26T19:25:07+01:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Disable activity stream - - - - - ca88729a by cypherpunks1 at 2023-01-26T19:25:15+01:00 fixup! Bug 40002: Remove about:ion Remove this._monitorIonPref() and this._monitorIonStudies() from BrowserGlue - - - - - 125e7f8f by cypherpunks1 at 2023-01-26T19:25:15+01:00 fixup! Firefox preference overrides. Disable toolkit.telemetry.enabled on all builds, set webextensions.storage.sync.enabled to false - - - - - 84ab5401 by cypherpunks1 at 2023-01-26T19:25:34+01:00 Bug 41565: Gate Telemetry Tasks behind MOZ_TELEMETRY_REPORTING - - - - - de007ee5 by Pier Angelo Vendrame at 2023-01-26T19:25:34+01:00 fixup! Firefox preference overrides. Document why we are locking toolkit.telemetry.enabled. - - - - - 5 changed files: - browser/app/profile/001-base-profile.js - browser/base/content/browser.js - browser/components/BrowserGlue.jsm - toolkit/components/telemetry/app/TelemetryEnvironment.jsm - toolkit/xre/nsAppRunner.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -119,7 +119,8 @@ pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false); // Make sure Unified Telemetry is really disabled, see: #18738. pref("toolkit.telemetry.unified", false); -pref("toolkit.telemetry.enabled", false); +// This needs to be locked, or nightly builds will automatically lock it to true +pref("toolkit.telemetry.enabled", false, locked); pref("toolkit.telemetry.server", "data:,"); pref("toolkit.telemetry.archive.enabled", false); pref("toolkit.telemetry.updatePing.enabled", false); // Make sure updater telemetry is disabled; see #25909. @@ -422,6 +423,8 @@ pref("extensions.postDownloadThirdPartyPrompt", false); // Therefore, do not allow download of additional language packs. They are not a // privacy/security threat, we are disabling them for UX reasons. See bug 41377. pref("intl.multilingual.downloadEnabled", false); +// Disk activity: Disable storage.sync (tor-browser#41424) +pref("webextensions.storage.sync.enabled", false); // Toolbar layout pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"security-level-button\",\"new-identity-button\",\"downloads-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"currentVersion\":14,\"newElementCount\":1}"); ===================================== browser/base/content/browser.js ===================================== @@ -6004,6 +6004,7 @@ var TabsProgressListener = { onStateChange(aBrowser, aWebProgress, aRequest, aStateFlags, aStatus) { // Collect telemetry data about tab load times. if ( + AppConstants.MOZ_TELEMETRY_REPORTING && aWebProgress.isTopLevel && (!aRequest.originalURI || aRequest.originalURI.scheme != "about") ) { ===================================== browser/components/BrowserGlue.jsm ===================================== @@ -22,9 +22,6 @@ XPCOMUtils.defineLazyModuleGetters(this, { ActorManagerParent: "resource://gre/modules/ActorManagerParent.jsm", AddonManager: "resource://gre/modules/AddonManager.jsm", AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm", - ASRouterDefaultConfig: - "resource://activity-stream/lib/ASRouterDefaultConfig.jsm", - ASRouterNewTabHook: "resource://activity-stream/lib/ASRouterNewTabHook.jsm", ASRouter: "resource://activity-stream/lib/ASRouter.jsm", AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm", BackgroundUpdate: "resource://gre/modules/BackgroundUpdate.jsm", @@ -717,27 +714,6 @@ let JSWINDOWACTORS = { matches: ["about:studies*"], }, - ASRouter: { - parent: { - moduleURI: "resource:///actors/ASRouterParent.jsm", - }, - child: { - moduleURI: "resource:///actors/ASRouterChild.jsm", - events: { - // This is added so the actor instantiates immediately and makes - // methods available to the page js on load. - DOMDocElementInserted: {}, - }, - }, - matches: [ - "about:home*", - "about:newtab*", - "about:welcome*", - "about:privatebrowsing", - ], - remoteTypes: ["privilegedabout"], - }, - SwitchDocumentDirection: { child: { moduleURI: "resource:///actors/SwitchDocumentDirectionChild.jsm", @@ -1693,7 +1669,9 @@ BrowserGlue.prototype = { this._firstWindowTelemetry(aWindow); this._firstWindowLoaded(); - this._collectStartupConditionsTelemetry(); + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + this._collectStartupConditionsTelemetry(); + } // Set the default favicon size for UI views that use the page-icon protocol. PlacesUtils.favicons.setDefaultIconURIPreferredSize( @@ -2006,7 +1984,6 @@ BrowserGlue.prototype = { () => NewTabUtils.uninit(), () => Normandy.uninit(), () => RFPHelper.uninit(), - () => ASRouterNewTabHook.destroy(), () => UpdateListener.reset(), ]; @@ -2347,8 +2324,6 @@ BrowserGlue.prototype = { this._monitorScreenshotsPref(); this._monitorWebcompatReporterPref(); this._monitorHTTPSOnlyPref(); - this._monitorIonPref(); - this._monitorIonStudies(); this._setupSearchDetection(); this._monitorGPCPref(); @@ -2717,12 +2692,6 @@ BrowserGlue.prototype = { }, }, - { - task: () => { - ASRouterNewTabHook.createInstance(ASRouterDefaultConfig()); - }, - }, - { condition: AppConstants.MOZ_UPDATE_AGENT, task: () => { @@ -2877,13 +2846,21 @@ BrowserGlue.prototype = { } }, - () => BrowserUsageTelemetry.reportProfileCount(), + () => { + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + BrowserUsageTelemetry.reportProfileCount(); + } + }, () => OsEnvironment.reportAllowedAppSources(), () => Services.search.runBackgroundChecks(), - () => BrowserUsageTelemetry.reportInstallationTelemetry(), + () => { + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + BrowserUsageTelemetry.reportInstallationTelemetry(); + } + }, ]; for (let task of idleTasks) { ===================================== toolkit/components/telemetry/app/TelemetryEnvironment.jsm ===================================== @@ -973,7 +973,9 @@ function EnvironmentCache() { p.push(this._addonBuilder.init()); this._currentEnvironment.profile = {}; - p.push(this._updateProfile()); + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + p.push(this._updateProfile()); + } if (AppConstants.MOZ_BUILD_APP == "browser") { p.push(this._loadAttributionAsync()); } ===================================== toolkit/xre/nsAppRunner.cpp ===================================== @@ -2800,7 +2800,9 @@ static ReturnAbortOnError ProfileLockedDialog(nsIFile* aProfileDir, rv = xpcom.Initialize(); NS_ENSURE_SUCCESS(rv, rv); +#if defined(MOZ_TELEMETRY_REPORTING) if (aProfileDir) mozilla::Telemetry::WriteFailedProfileLock(aProfileDir); +#endif rv = xpcom.SetWindowCreator(aNative); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/69be75… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/69be75… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 26 Jan '23

26 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 933d8c65 by Pier Angelo Vendrame at 2023-01-26T09:55:06+01:00 fixup! Firefox preference overrides. Document why we are locking toolkit.telemetry.enabled. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -119,6 +119,7 @@ pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false); // Make sure Unified Telemetry is really disabled, see: #18738. pref("toolkit.telemetry.unified", false); +// This needs to be locked, or nightly builds will automatically lock it to true pref("toolkit.telemetry.enabled", false, locked); pref("toolkit.telemetry.server", "data:,"); pref("toolkit.telemetry.archive.enabled", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/933d8c6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/933d8c6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 5 commits: Bug 40745: Allow customizing MOZ_APP_BASENAME
by Pier Angelo Vendrame (＠pierov) 26 Jan '23

26 Jan '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 499e5d26 by Pier Angelo Vendrame at 2023-01-26T17:35:56+01:00 Bug 40745: Allow customizing MOZ_APP_BASENAME MOZ_APP_BASENAME has direct effects on directory and file names, too. So, we need to adjust the firefox project to use the custom names. - - - - - c8f30851 by Pier Angelo Vendrame at 2023-01-26T17:36:04+01:00 Bug 40742: Create placeholder files for Privacy Browser installers Create placeholder files for the NSIS installer and for the DMG. - - - - - 8b16afc6 by Pier Angelo Vendrame at 2023-01-26T17:37:41+01:00 Bug 40742: Add Privacy Browser targets Add the needed targets needed to build privacy browser. - - - - - 87db400a by Pier Angelo Vendrame at 2023-01-26T17:37:41+01:00 Bug 40753: Do not copy mar tools when the updater is disabled In tor-browser#41587 we have disabled the updater for Base Browser. However, this also disable the compilation of mar tools, so we should make their copy conditional, which this commit does. - - - - - ba13fa7f by Pier Angelo Vendrame at 2023-01-26T17:37:41+01:00 Bug 40754: Provide uBlock Origin to Privacy Browser - - - - - 19 changed files: - .gitignore - Makefile - README - doc/MAKEFILE.txt - + projects/browser/Bundle-Data/PrivacyBrowser.dmg/.DS_Store - + projects/browser/Bundle-Data/PrivacyBrowser.dmg/.VolumeIcon.icns - + projects/browser/Bundle-Data/PrivacyBrowser.dmg/.background/background.png - projects/browser/RelativeLink/start-browser - projects/browser/build - projects/browser/config - projects/browser/windows-installer/basebrowser.nsi - + projects/browser/windows-installer/privacybrowser.ico - + projects/browser/windows-installer/privacybrowser.nsi - projects/browser/windows-installer/torbrowser.nsi - projects/firefox/build - projects/firefox/config - projects/firefox/start-firefox - projects/release/config - rbm.conf Changes: ===================================== .gitignore ===================================== @@ -4,7 +4,13 @@ /out /torbrowser /basebrowser +/privacybrowser /testbuild /rbm.local.conf /logs /tmp + +# Old build directories, let's keep them anyway +/release +/alpha +/nightly ===================================== Makefile ===================================== @@ -180,103 +180,43 @@ torbrowser-testbuild-macos-aarch64: submodule-update torbrowser-testbuild-src: submodule-update $(rbm) build release --target testbuild --target browser-src-testbuild --target torbrowser -signtag-release: submodule-update - $(rbm) build release --step signtag --target release --target torbrowser - -signtag-alpha: submodule-update - $(rbm) build release --step signtag --target alpha --target torbrowser - -incrementals-release: submodule-update +torbrowser-incrementals-release: submodule-update $(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target torbrowser tools/update-responses/download_missing_versions release tools/update-responses/gen_incrementals release $(rbm) build release --step hash_incrementals --target release --target torbrowser -incrementals-alpha: submodule-update +torbrowser-incrementals-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target torbrowser tools/update-responses/download_missing_versions alpha tools/update-responses/gen_incrementals alpha $(rbm) build release --step hash_incrementals --target alpha --target torbrowser -incrementals-nightly: submodule-update +torbrowser-incrementals-nightly: submodule-update $(rbm) build release --step update_responses_config --target nightly --target torbrowser NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals nightly $(rbm) build release --step hash_incrementals --target nightly --target torbrowser -update_responses-release: submodule-update +torbrowser-update_responses-release: submodule-update $(rbm) build release --step update_responses_config --target release --target signed --target torbrowser $(rbm) build release --step create_update_responses_tar --target release --target signed --target torbrowser -update_responses-alpha: submodule-update +torbrowser-update_responses-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target signed --target torbrowser $(rbm) build release --step create_update_responses_tar --target alpha --target signed --target torbrowser -dmg2mar-release: submodule-update +torbrowser-dmg2mar-release: submodule-update $(rbm) build release --step update_responses_config --target release --target signed --target torbrowser $(rbm) build release --step dmg2mar --target release --target signed --target torbrowser tools/update-responses/download_missing_versions release CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release -dmg2mar-alpha: submodule-update +torbrowser-dmg2mar-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target signed --target torbrowser $(rbm) build release --step dmg2mar --target alpha --target signed --target torbrowser tools/update-responses/download_missing_versions alpha CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha -list_translation_updates-release: - $(rbm) showconf --target release --step list_updates translation list_updates - -list_translation_updates-alpha: - $(rbm) showconf --target alpha --step list_updates translation list_updates - -list_toolchain_updates-fenix: submodule-update - $(rbm) build fenix --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 - -list_toolchain_updates-firefox-linux: submodule-update - $(rbm) build firefox --step list_toolchain_updates --target nightly --target torbrowser-linux-x86_64 - -list_toolchain_updates-firefox-windows: submodule-update - $(rbm) build firefox --step list_toolchain_updates --target nightly --target torbrowser-windows-x86_64 - -list_toolchain_updates-firefox-macos: submodule-update - $(rbm) build firefox --step list_toolchain_updates --target nightly --target torbrowser-macos - -list_toolchain_updates-android-components: submodule-update - $(rbm) build android-components --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 - -list_toolchain_updates-application-services: submodule-update - $(rbm) build application-services --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 - -list_toolchain_updates-geckoview: submodule-update - $(rbm) build geckoview --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 - -create_glean_deps_tarball: submodule-update - $(rbm) build glean --step create_glean_deps_tarball --target alpha --target torbrowser-android-armv7 - -create_glean_deps_tarball-with_torsocks: submodule-update - $(rbm) build glean --step create_glean_deps_tarball --target alpha --target torbrowser-android-armv7 --target with_torsocks - -get_gradle_dependencies_list-fenix: submodule-update - $(rbm) build fenix --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7 - -get_gradle_dependencies_list-application-services: submodule-update - $(rbm) build application-services --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7 - -get_gradle_dependencies_list-android-components: submodule-update - $(rbm) build android-components --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7 - -cargo_vendor-application-services: submodule-update - $(rbm) build application-services --step cargo_vendor --target nightly --target torbrowser-android-armv7 - -cargo_vendor-cbindgen-android: submodule-update - $(rbm) build cbindgen --step cargo_vendor --target nightly --target torbrowser-android-armv7 - -cargo_vendor-cbindgen: submodule-update - $(rbm) build cbindgen --step cargo_vendor --target nightly --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 - ######################## # Base Browser Targets # @@ -457,6 +397,197 @@ basebrowser-testbuild-src: submodule-update $(rbm) build release --target testbuild --target browser-src-testbuild --target basebrowser +########################### +# Privacy Browser Targets # +########################### + +privacybrowser-release: submodule-update + $(rbm) build release --target release --target browser-all-desktop --target privacybrowser + +privacybrowser-release-desktop: submodule-update + $(rbm) build release --target release --target browser-all-desktop --target privacybrowser + +privacybrowser-release-linux-x86_64: submodule-update + $(rbm) build release --target release --target browser-linux-x86_64 --target privacybrowser + +privacybrowser-release-linux-x86_64-asan: submodule-update + $(rbm) build release --target release --target browser-linux-x86_64-asan --target privacybrowser + +privacybrowser-release-windows-x86_64: submodule-update + $(rbm) build release --target release --target browser-windows-x86_64 --target privacybrowser + +privacybrowser-release-macos: submodule-update + $(rbm) build release --target release --target browser-macos --target privacybrowser + +privacybrowser-release-src: submodule-update + $(rbm) build release --target release --target browser-src --target privacybrowser + +privacybrowser-alpha: submodule-update + $(rbm) build release --target alpha --target browser-all-desktop --target privacybrowser + +privacybrowser-alpha-desktop: submodule-update + $(rbm) build release --target alpha --target browser-all-desktop --target privacybrowser + +privacybrowser-alpha-linux-x86_64: submodule-update + $(rbm) build release --target alpha --target browser-linux-x86_64 --target privacybrowser + +privacybrowser-alpha-linux-x86_64-asan: submodule-update + $(rbm) build release --target alpha --target browser-linux-x86_64-asan --target privacybrowser + +privacybrowser-alpha-windows-x86_64: submodule-update + $(rbm) build release --target alpha --target browser-windows-x86_64 --target privacybrowser + +privacybrowser-alpha-macos: submodule-update + $(rbm) build release --target alpha --target browser-macos --target privacybrowser + +privacybrowser-alpha-src: submodule-update + $(rbm) build release --target alpha --target browser-src --target privacybrowser + +privacybrowser-nightly: submodule-update + $(rbm) build release --target nightly --target browser-all-desktop --target privacybrowser + +privacybrowser-nightly-desktop: submodule-update + $(rbm) build release --target nightly --target browser-all-desktop --target privacybrowser + +privacybrowser-nightly-linux-x86_64: submodule-update + $(rbm) build release --target nightly --target browser-linux-x86_64 --target privacybrowser + +privacybrowser-nightly-linux-x86_64-asan: submodule-update + $(rbm) build release --target nightly --target browser-linux-x86_64-asan --target privacybrowser + +privacybrowser-nightly-windows-x86_64: submodule-update + $(rbm) build release --target nightly --target browser-windows-x86_64 --target privacybrowser + +privacybrowser-nightly-macos: submodule-update + $(rbm) build release --target nightly --target browser-macos --target privacybrowser + +privacybrowser-nightly-src: submodule-update + $(rbm) build release --target nightly --target browser-src --target privacybrowser + +privacybrowser-testbuild: submodule-update + $(rbm) build release --target testbuild --target browser-all-desktop --target privacybrowser + +privacybrowser-testbuild-desktop: submodule-update + $(rbm) build release --target testbuild --target browser-all-desktop --target privacybrowser + +privacybrowser-testbuild-linux-x86_64: submodule-update + $(rbm) build release --target testbuild --target browser-linux-x86_64 --target privacybrowser + +privacybrowser-testbuild-linux-x86_64-asan: submodule-update + $(rbm) build release --target testbuild --target browser-linux-x86_64-asan --target privacybrowser + +privacybrowser-testbuild-windows-x86_64: submodule-update + $(rbm) build release --target testbuild --target browser-windows-x86_64 --target privacybrowser + +privacybrowser-testbuild-macos: submodule-update + $(rbm) build release --target testbuild --target browser-macos --target privacybrowser + +privacybrowser-testbuild-macos-x86_64: submodule-update + $(rbm) build release --target testbuild --target browser-macos-x86_64 --target privacybrowser + +privacybrowser-testbuild-macos-aarch64: submodule-update + $(rbm) build release --target testbuild --target browser-macos-aarch64 --target privacybrowser + +privacybrowser-testbuild-src: submodule-update + $(rbm) build release --target testbuild --target browser-src-testbuild --target privacybrowser + +privacybrowser-incrementals-release: submodule-update + $(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target privacybrowser + tools/update-responses/download_missing_versions release + tools/update-responses/gen_incrementals release + $(rbm) build release --step hash_incrementals --target release --target privacybrowser + +privacybrowser-incrementals-alpha: submodule-update + $(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target privacybrowser + tools/update-responses/download_missing_versions alpha + tools/update-responses/gen_incrementals alpha + $(rbm) build release --step hash_incrementals --target alpha --target privacybrowser + +privacybrowser-incrementals-nightly: submodule-update + $(rbm) build release --step update_responses_config --target nightly --target privacybrowser + NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals nightly + $(rbm) build release --step hash_incrementals --target nightly --target privacybrowser + +privacybrowser-update_responses-release: submodule-update + $(rbm) build release --step update_responses_config --target release --target signed --target privacybrowser + $(rbm) build release --step create_update_responses_tar --target release --target signed --target privacybrowser + +privacybrowser-update_responses-alpha: submodule-update + $(rbm) build release --step update_responses_config --target alpha --target signed --target privacybrowser + $(rbm) build release --step create_update_responses_tar --target alpha --target signed --target privacybrowser + +privacybrowser-dmg2mar-release: submodule-update + $(rbm) build release --step update_responses_config --target release --target signed --target privacybrowser + $(rbm) build release --step dmg2mar --target release --target signed --target privacybrowser + tools/update-responses/download_missing_versions release + CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release + +privacybrowser-dmg2mar-alpha: submodule-update + $(rbm) build release --step update_responses_config --target alpha --target signed --target privacybrowser + $(rbm) build release --step dmg2mar --target alpha --target signed --target privacybrowser + tools/update-responses/download_missing_versions alpha + CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha + + +############################ +# Toolchain Update Targets # +############################ + +list_translation_updates-release: + $(rbm) showconf --target release --step list_updates translation list_updates + +list_translation_updates-alpha: + $(rbm) showconf --target alpha --step list_updates translation list_updates + +list_toolchain_updates-fenix: submodule-update + $(rbm) build fenix --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 + +list_toolchain_updates-firefox-linux: submodule-update + $(rbm) build firefox --step list_toolchain_updates --target nightly --target torbrowser-linux-x86_64 + +list_toolchain_updates-firefox-windows: submodule-update + $(rbm) build firefox --step list_toolchain_updates --target nightly --target torbrowser-windows-x86_64 + +list_toolchain_updates-firefox-macos: submodule-update + $(rbm) build firefox --step list_toolchain_updates --target nightly --target torbrowser-macos + +list_toolchain_updates-android-components: submodule-update + $(rbm) build android-components --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 + +list_toolchain_updates-application-services: submodule-update + $(rbm) build application-services --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 + +list_toolchain_updates-geckoview: submodule-update + $(rbm) build geckoview --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 + +create_glean_deps_tarball: submodule-update + $(rbm) build glean --step create_glean_deps_tarball --target alpha --target torbrowser-android-armv7 + +create_glean_deps_tarball-with_torsocks: submodule-update + $(rbm) build glean --step create_glean_deps_tarball --target alpha --target torbrowser-android-armv7 --target with_torsocks + +get_gradle_dependencies_list-fenix: submodule-update + $(rbm) build fenix --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7 + +get_gradle_dependencies_list-application-services: submodule-update + $(rbm) build application-services --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7 + +get_gradle_dependencies_list-android-components: submodule-update + $(rbm) build android-components --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7 + +cargo_vendor-application-services: submodule-update + $(rbm) build application-services --step cargo_vendor --target nightly --target torbrowser-android-armv7 + +cargo_vendor-cbindgen-android: submodule-update + $(rbm) build cbindgen --step cargo_vendor --target nightly --target torbrowser-android-armv7 + +cargo_vendor-cbindgen: submodule-update + $(rbm) build cbindgen --step cargo_vendor --target nightly --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 + + ################## # Common Targets # ################## @@ -464,6 +595,12 @@ basebrowser-testbuild-src: submodule-update submodule-update: git submodule update --init +signtag-release: submodule-update + $(rbm) build release --step signtag --target release --target torbrowser + +signtag-alpha: submodule-update + $(rbm) build release --step signtag --target alpha --target torbrowser + fetch: submodule-update $(rbm) fetch ===================================== README ===================================== @@ -96,9 +96,9 @@ mar file will be created. If you want to base your testbuild on the latest nightly code insted, rename rbm.local.conf.example to rbm.local.conf and adapt the torbrowser-testbuild option accordingly. -Similar makefile targets exist for building Base Browser instead of -Tor Browser. To build Base Browser, replace `torbrowser` by `basebrowser` -in the target name. +Similar makefile targets exist for building Base Browser and Privacy Browser +instead of Tor Browser. To build Base Browser, replace `torbrowser` by +`basebrowser` in the target name. For Privacy Browser, use `privacybrowser`. Updating git sources ===================================== doc/MAKEFILE.txt ===================================== @@ -75,6 +75,11 @@ basebrowser-* The same rules for building Tor Browser also exist for building Base Browser. +privacybrowser-* +---------------- +The same rules for building Tor Browser also exist for building +Privacy Browser. + fetch ----- Fetch new commits from all components. This is useful when you want to ===================================== projects/browser/Bundle-Data/PrivacyBrowser.dmg/.DS_Store ===================================== Binary files /dev/null and b/projects/browser/Bundle-Data/PrivacyBrowser.dmg/.DS_Store differ ===================================== projects/browser/Bundle-Data/PrivacyBrowser.dmg/.VolumeIcon.icns ===================================== Binary files /dev/null and b/projects/browser/Bundle-Data/PrivacyBrowser.dmg/.VolumeIcon.icns differ ===================================== projects/browser/Bundle-Data/PrivacyBrowser.dmg/.background/background.png ===================================== Binary files /dev/null and b/projects/browser/Bundle-Data/PrivacyBrowser.dmg/.background/background.png differ ===================================== projects/browser/RelativeLink/start-browser ===================================== @@ -94,8 +94,8 @@ fi print_usage () { printf "\n[% c('var/Project_Name') %] Script Options\n" - printf " --verbose Display Tor and Firefox output in the terminal\n" - printf " --log [file] Record Tor and Firefox output in file (default: [% c('var/project-name') %].log)\n" + printf " --verbose Display [% IF c("var/tor-browser") -%]Tor and [% END -%]the browser output in the terminal\n" + printf " --log [file] Record [% IF c("var/tor-browser") -%]Tor and [% END -%]the browser output in file (default: [% c('var/project-name') %].log)\n" printf " --detach Detach from terminal and run [% c('var/Project_Name') %] in the background.\n" printf " --register-app Register [% c('var/Project_Name') %] as a desktop app for this user\n" printf " --unregister-app Unregister [% c('var/Project_Name') %] as a desktop app for this user\n" @@ -356,22 +356,22 @@ cd "${HOME}" if [ "$show_usage" -eq 1 ]; then # Display Firefox help, then our help - [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./firefox \ + [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] \ --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" --help 2>/dev/null print_usage elif [ "$detach" -eq 1 ] ; then - [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./firefox \ + [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] \ --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" "${@}" > "$logfile" 2>&1 </dev/null & disown "$!" elif [ "$log_output" -eq 1 -a "$show_output" -eq 1 ]; then - [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./firefox \ + [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] \ --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" "${@}" 2>&1 </dev/null | \ tee "$logfile" elif [ "$show_output" -eq 1 ]; then - [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./firefox \ + [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] \ --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" "${@}" < /dev/null else - [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./firefox \ + [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] \ --class "[% c('var/Project_Name') %]" --name "[% c('var/Project_Name') %]" "${@}" > "$logfile" 2>&1 </dev/null fi ===================================== projects/browser/build ===================================== @@ -56,12 +56,17 @@ do mkdir -p "$tbdir/$EXTSPATH" done -# Extract the MAR tools. -unzip -d $rootdir $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip -MARTOOLS=$rootdir/mar-tools +[% IF c("var/updater_enabled") -%] + # Extract the MAR tools. + unzip -d $rootdir $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip + MARTOOLS=$rootdir/mar-tools +[% END -%] mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" -[% IF !c("var/macos") -%] +[% IF c("var/privacy-browser") -%] + mv [% c('input_files_by_name/ublock-origin') %] "$TBDIR/$EXTSPATH/uBlock0(a)raymondhill.net.xpi" +[% END -%] +[% IF !c("var/macos") && c("var/tor-browser") -%] cp "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" "$TBDIR/$PROFILEPATH/" [% END %] @@ -291,10 +296,11 @@ done # mozpack.mozjar.JarReaderError: Central directory and file header mismatch. Corrupted archive? # # See https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/4… - mv "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" $rootdir/ns.xpi + mkdir $rootdir/extensions + mv "$TBDIR/$EXTSPATH/"* $rootdir/extensions MOZ_AUTOMATION=1 $firefox_src/mach python $firefox_src/toolkit/mozapps/installer/unify.py "$TBDIR" "$TBDIR_AARCH64" mkdir -p "$TBDIR/$EXTSPATH" - mv $rootdir/ns.xpi "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" + mv $rootdir/extensions/* "$TBDIR/$EXTSPATH/" rm -Rf "$TBDIR_AARCH64" [% END -%] @@ -311,14 +317,15 @@ cat > "$scripts_dir/create-$PKG_DIR" << SCRIPT_EOF set -e cp -a ${TB_STAGE_DIR} $distdir/$PKG_DIR -pushd "$TBDIR[% IF c("var/macos") %]/Contents/Resources/[% END %]" -rm -f precomplete -python $MARTOOLS/createprecomplete.py -popd - +[% IF c("var/updater_enabled") -%] + pushd "$TBDIR[% IF c("var/macos") %]/Contents/Resources/[% END %]" + rm -f precomplete + python $MARTOOLS/createprecomplete.py + popd +[% END -%] cd $distdir -[% IF c("var/build_mar") -%] +[% IF c("var/build_mar") && c("var/updater_enabled") -%] # Create full MAR file and compressed package. [% SET mar_file = c("var/project-name") _ '-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_${PKG_LOCALE}.mar' %] MAR=$MARTOOLS/mar \ @@ -352,7 +359,9 @@ cd $distdir rm -rf $distdir/${PKG_DIR} SCRIPT_EOF -cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ +[% IF c("var/updater_enabled") -%] + cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ +[% END -%] [% IF c("var/linux-x86_64") -%] [% IF c("var/tor-browser") -%] cp $rootdir/[% c('input_files_by_name/firefox') %]/browser-debug.tar.xz "$OUTDIR"/[% c("var/project-name") %]-[% c("var/mar_osname") %]-debug.tar.xz ===================================== projects/browser/config ===================================== @@ -67,6 +67,9 @@ targets: basebrowser: var: prefs_file: 001-base-profile.js + privacybrowser: + var: + prefs_file: 001-base-profile.js input_files: - project: container-image @@ -103,6 +106,10 @@ input_files: - URL: https://addons.mozilla.org/firefox/downloads/file/4050735/noscript-11.4.14.… name: noscript sha256sum: 14af6a3cbc269c045f2d950e1e4f7c29981b35a7abc61d2413f5bb8bd7311857 + - URL: https://addons.mozilla.org/firefox/downloads/file/4047353/ublock_origin-1.4… + name: ublock-origin + sha256sum: 6bf8af5266353fab5eabdc7476de026e01edfb7901b0430c5e539f6791f1edc8 + enable: '[% c("var/privacy-browser") %]' - filename: 'gtk3-settings.ini' enable: '[% c("var/linux") %]' - project: hfsplus-tools ===================================== projects/browser/windows-installer/basebrowser.nsi ===================================== @@ -3,7 +3,7 @@ ;released under Public Domain ;-------------------------------- -;Modern" UI +;Modern UI !include "MUI2.nsh" !include "LogicLib.nsh" @@ -11,16 +11,16 @@ ;-------------------------------- ;General - + ; location of Base Browser bundle to put into installer - !define TBBSOURCE ".\Base Browser\" + !define TBBSOURCE ".\Base Browser\" Name "Base Browser" OutFile "basebrowser-install.exe" ;Default installation folder InstallDir "$DESKTOP\Base Browser" - + ;Best (but slowest) compression SetCompressor /SOLID lzma SetCompressorDictSize 32 @@ -117,11 +117,11 @@ ;-------------------------------- ;Reserve Files - + ;If you are using solid compression, files that are required before ;the actual installation should be stored first in the data block, ;because this will make your installer start faster. - + !insertmacro MUI_RESERVEFILE_LANGDLL ;-------------------------------- @@ -138,7 +138,7 @@ SectionEnd Function CreateShortcuts - CreateShortCut "$SMPROGRAMS\Start Base Browser.lnk" "$INSTDIR\Browser\firefox.exe" + CreateShortCut "$SMPROGRAMS\Start Base Browser.lnk" "$INSTDIR\Browser\firefox.exe" CreateShortCut "$DESKTOP\Start Base Browser.lnk" "$INSTDIR\Browser\firefox.exe" FunctionEnd ===================================== projects/browser/windows-installer/privacybrowser.ico ===================================== Binary files /dev/null and b/projects/browser/windows-installer/privacybrowser.ico differ ===================================== projects/browser/windows-installer/privacybrowser.nsi ===================================== @@ -0,0 +1,180 @@ +;NSIS Installer for Privacy Browser +;Written by Moritz Bartl +;released under Public Domain + +;-------------------------------- +;Modern UI + + !include "MUI2.nsh" + !include "LogicLib.nsh" + !include "WinVer.nsh" + +;-------------------------------- +;General + + ; location of Privacy Browser bundle to put into installer + !define TBBSOURCE ".\Privacy Browser\" + + Name "Privacy Browser" + OutFile "privacybrowser-install.exe" + + ;Default installation folder + InstallDir "$DESKTOP\Privacy Browser" + + ;Best (but slowest) compression + SetCompressor /SOLID lzma + SetCompressorDictSize 32 + + ;Request application privileges for Windows Vista + RequestExecutionLevel user + +;-------------------------------- +;Interface Configuration + + !define MUI_ICON "privacybrowser.ico" + !define MUI_ABORTWARNING + +;-------------------------------- +;Modern UI settings + !define MUI_FINISHPAGE_NOREBOOTSUPPORT ; we don't require a reboot + !define MUI_FINISHPAGE_RUN + !define MUI_FINISHPAGE_RUN_FUNCTION "StartPrivacyBrowser" + !define MUI_FINISHPAGE_SHOWREADME ; misuse for option to create shortcut; less ugly than MUI_PAGE_COMPONENTS + !define MUI_FINISHPAGE_SHOWREADME_TEXT "&Add Start Menu && Desktop shortcuts" + !define MUI_FINISHPAGE_SHOWREADME_FUNCTION "CreateShortCuts" +;-------------------------------- +;Pages + + !define MUI_PAGE_CUSTOMFUNCTION_LEAVE CheckIfTargetDirectoryExists + !insertmacro MUI_PAGE_DIRECTORY + !insertmacro MUI_PAGE_INSTFILES + !insertmacro MUI_PAGE_FINISH + +;-------------------------------- +;Languages + + !insertmacro MUI_LANGUAGE "English" ;first language is the default language + !insertmacro MUI_LANGUAGE "French" + !insertmacro MUI_LANGUAGE "German" + !insertmacro MUI_LANGUAGE "Spanish" + !insertmacro MUI_LANGUAGE "SpanishInternational" + !insertmacro MUI_LANGUAGE "SimpChinese" + !insertmacro MUI_LANGUAGE "TradChinese" + !insertmacro MUI_LANGUAGE "Japanese" + !insertmacro MUI_LANGUAGE "Korean" + !insertmacro MUI_LANGUAGE "Italian" + !insertmacro MUI_LANGUAGE "Dutch" + !insertmacro MUI_LANGUAGE "Danish" + !insertmacro MUI_LANGUAGE "Swedish" + !insertmacro MUI_LANGUAGE "Norwegian" + !insertmacro MUI_LANGUAGE "NorwegianNynorsk" + !insertmacro MUI_LANGUAGE "Finnish" + !insertmacro MUI_LANGUAGE "Greek" + !insertmacro MUI_LANGUAGE "Russian" + !insertmacro MUI_LANGUAGE "Portuguese" + !insertmacro MUI_LANGUAGE "PortugueseBR" + !insertmacro MUI_LANGUAGE "Polish" + !insertmacro MUI_LANGUAGE "Ukrainian" + !insertmacro MUI_LANGUAGE "Czech" + !insertmacro MUI_LANGUAGE "Slovak" + !insertmacro MUI_LANGUAGE "Croatian" + !insertmacro MUI_LANGUAGE "Bulgarian" + !insertmacro MUI_LANGUAGE "Hungarian" + !insertmacro MUI_LANGUAGE "Thai" + !insertmacro MUI_LANGUAGE "Romanian" + !insertmacro MUI_LANGUAGE "Latvian" + !insertmacro MUI_LANGUAGE "Macedonian" + !insertmacro MUI_LANGUAGE "Estonian" + !insertmacro MUI_LANGUAGE "Turkish" + !insertmacro MUI_LANGUAGE "Lithuanian" + !insertmacro MUI_LANGUAGE "Slovenian" + !insertmacro MUI_LANGUAGE "Serbian" + !insertmacro MUI_LANGUAGE "SerbianLatin" + !insertmacro MUI_LANGUAGE "Arabic" + !insertmacro MUI_LANGUAGE "Farsi" + !insertmacro MUI_LANGUAGE "Hebrew" + !insertmacro MUI_LANGUAGE "Indonesian" + !insertmacro MUI_LANGUAGE "Mongolian" + !insertmacro MUI_LANGUAGE "Luxembourgish" + !insertmacro MUI_LANGUAGE "Albanian" + !insertmacro MUI_LANGUAGE "Breton" + !insertmacro MUI_LANGUAGE "Belarusian" + !insertmacro MUI_LANGUAGE "Icelandic" + !insertmacro MUI_LANGUAGE "Malay" + !insertmacro MUI_LANGUAGE "Bosnian" + !insertmacro MUI_LANGUAGE "Kurdish" + !insertmacro MUI_LANGUAGE "Irish" + !insertmacro MUI_LANGUAGE "Uzbek" + !insertmacro MUI_LANGUAGE "Galician" + !insertmacro MUI_LANGUAGE "Afrikaans" + !insertmacro MUI_LANGUAGE "Catalan" + !insertmacro MUI_LANGUAGE "Esperanto" + +;-------------------------------- +;Reserve Files + + ;If you are using solid compression, files that are required before + ;the actual installation should be stored first in the data block, + ;because this will make your installer start faster. + + !insertmacro MUI_RESERVEFILE_LANGDLL + +;-------------------------------- +;Installer Sections + +Section "Privacy Browser" SecPB + + SetOutPath "$INSTDIR" + File /r "${TBBSOURCE}\*.*" + SetOutPath "$INSTDIR\Browser" + CreateShortCut "$INSTDIR\Start Privacy Browser.lnk" "$INSTDIR\Browser\privacybrowser.exe" + +SectionEnd + +Function CreateShortcuts + + CreateShortCut "$SMPROGRAMS\Start Privacy Browser.lnk" "$INSTDIR\Browser\privacybrowser.exe" + CreateShortCut "$DESKTOP\Start Privacy Browser.lnk" "$INSTDIR\Browser\privacybrowser.exe" + +FunctionEnd +;-------------------------------- +;Installer Functions + +Function .onInit + + ${IfNot} ${AtLeastWin7} + MessageBox MB_USERICON|MB_OK "Privacy Browser requires at least Windows 7" + SetErrorLevel 1 + Quit + ${EndIf} + + ; Don't install on systems that don't support SSE2. The parameter value of + ; 10 is for PF_XMMI64_INSTRUCTIONS_AVAILABLE which will check whether the + ; SSE2 instruction set is available. + System::Call "kernel32::IsProcessorFeaturePresent(i 10)i .R7" + + ${If} "$R7" == "0" + MessageBox MB_OK|MB_ICONSTOP "Sorry, Privacy Browser can't be installed. This version of Privacy Browser requires a processor with SSE2 support." + Abort + ${EndIf} + + !insertmacro MUI_LANGDLL_DISPLAY + +FunctionEnd + +;-------------------------------- +;Helper Functions + +Function CheckIfTargetDirectoryExists +${If} ${FileExists} "$INSTDIR\*.*" + MessageBox MB_YESNO "The destination directory already exists. You can try to upgrade Privacy Browser, but if you run into any problems, use a new directory instead. Continue?" IDYES NoAbort + Abort + NoAbort: +${EndIf} +FunctionEnd + + +Function StartPrivacyBrowser +ExecShell "open" "$INSTDIR/Start Privacy Browser.lnk" +FunctionEnd + ===================================== projects/browser/windows-installer/torbrowser.nsi ===================================== @@ -3,7 +3,7 @@ ;released under Public Domain ;-------------------------------- -;Modern" UI +;Modern UI !include "MUI2.nsh" !include "LogicLib.nsh" @@ -11,16 +11,16 @@ ;-------------------------------- ;General - + ; location of Tor Browser bundle to put into installer - !define TBBSOURCE ".\Tor Browser\" + !define TBBSOURCE ".\Tor Browser\" Name "Tor Browser" OutFile "torbrowser-install.exe" ;Default installation folder InstallDir "$DESKTOP\Tor Browser" - + ;Best (but slowest) compression SetCompressor /SOLID lzma SetCompressorDictSize 32 @@ -117,11 +117,11 @@ ;-------------------------------- ;Reserve Files - + ;If you are using solid compression, files that are required before ;the actual installation should be stored first in the data block, ;because this will make your installer start faster. - + !insertmacro MUI_RESERVEFILE_LANGDLL ;-------------------------------- @@ -138,7 +138,7 @@ SectionEnd Function CreateShortcuts - CreateShortCut "$SMPROGRAMS\Start Tor Browser.lnk" "$INSTDIR\Browser\firefox.exe" + CreateShortCut "$SMPROGRAMS\Start Tor Browser.lnk" "$INSTDIR\Browser\firefox.exe" CreateShortCut "$DESKTOP\Start Tor Browser.lnk" "$INSTDIR\Browser\firefox.exe" FunctionEnd ===================================== projects/firefox/build ===================================== @@ -175,8 +175,8 @@ export LANG=C.UTF-8 [% IF c("var/tor-browser") -%] --with-tor-browser-version=[% c("var/torbrowser_version") %] \ --enable-update-channel=[% c("var/channel") %] \ - --with-branding=[% c("var/branding_directory") %] \ [% END %] \ + [% IF !c("var/base-browser") -%]--with-branding=browser/branding/[% c("var/branding_directory_prefix") %]-[% c("var/channel") %][% END %] \ [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %] ./mach build --verbose @@ -190,12 +190,12 @@ export LANG=C.UTF-8 [% END %] [% IF c("var/macos") %] - cp -a obj-*/dist/firefox/* $distdir + cp -a obj-*/dist/[% c('var/exe_name') %]/* $distdir [% IF c("var/base-browser") -%] mv "$distdir/Firefox.app" "$distdir/[% c('var/Project_Name') %].app" [% END -%] # Remove firefox-bin (we don't use it, see ticket #10126) - rm -f "$distdir/[% c('var/Project_Name') %].app/Contents/MacOS/firefox-bin" + rm -f "$distdir/[% c('var/Project_Name') %].app/Contents/MacOS/[% c('var/exe_name') %]-bin" # Adjust the Info.plist file INFO_PLIST="$distdir/[% c('var/Project_Name') %].app/Contents/Info.plist" @@ -208,21 +208,23 @@ export LANG=C.UTF-8 [% IF c("var/linux-x86_64") && !c("var/asan") %] cp obj-*/testing/geckodriver/x86_64-unknown-linux-gnu/release/geckodriver $distdir [% END %] - cp -a obj-*/dist/firefox/* $distdir/Browser/ + cp -a obj-*/dist/[% c('var/exe_name') %]/* $distdir/Browser/ # Remove firefox-bin (we don't use it, see ticket #10126) - rm -f $distdir/Browser/firefox-bin + rm -f "$distdir/Browser/[% c('var/exe_name') %]-bin" # TODO: There goes FIPS-140.. We could upload these somewhere unique and # subsequent builds could test to see if they've been uploaded before... # But let's find out if it actually matters first.. rm -f $distdir/Browser/*.chk - # Replace firefox by a wrapper script (#25485) - mv $distdir/Browser/firefox $distdir/Browser/firefox.real - mv $rootdir/start-firefox $distdir/Browser/firefox - chmod 755 $distdir/Browser/firefox + # Replace $exe_name by a wrapper script (#25485) + mv "$distdir/Browser/[% c('var/exe_name') %]" "$distdir/Browser/[% c('var/exe_name') %].real" + cat > "$distdir/Browser/[% c('var/exe_name') %]" << 'RBM_TB_EOF' +[% INCLUDE 'start-firefox' -%] +RBM_TB_EOF + chmod 755 "$distdir/Browser/[% c('var/exe_name') %]" [% END %] [% IF c("var/windows") %] - cp -a obj-*/dist/firefox/* $distdir/Browser/ + cp -a obj-*/dist/[% c('var/exe_name') %]/* $distdir/Browser/ [% IF c("var/windows-i686") %] cp -a /var/tmp/dist/fxc2/bin/d3dcompiler_47_32.dll $distdir/Browser/d3dcompiler_47.dll [% ELSE %] @@ -230,46 +232,48 @@ export LANG=C.UTF-8 [% END %] [% END %] -# Make MAR-based update tools available for use during the bundle phase. -# Note that mar and mbsdiff are standalone tools, compiled for the build -# host's architecture. We also include signmar, certutil, and the libraries -# they require; these utilities and libraries are built for the target -# architecture. -MARTOOLS=$distdir/mar-tools -mkdir -p $MARTOOLS -cp -p config/createprecomplete.py $MARTOOLS/ -cp -p tools/update-packaging/*.sh $MARTOOLS/ -cp -p obj-*/dist/host/bin/mar $MARTOOLS/ -cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ -[% IF c("var/linux") || c("var/macos") %] - cp -p obj-*/dist/bin/signmar $MARTOOLS/ - cp -p obj-*/dist/bin/certutil $MARTOOLS/ - cp -p obj-*/dist/bin/modutil $MARTOOLS/ - cp -p obj-*/dist/bin/pk12util $MARTOOLS/ - cp -p obj-*/dist/bin/shlibsign $MARTOOLS/ - [% IF c("var/linux") %] - NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssckbi.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" - NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" - [% ELSE %] - NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssckbi.dylib libsoftokn3.dylib" - # No NSPR_LIBS for macOS - NSPR_LIBS="" - [% END %] - for LIB in $NSS_LIBS $NSPR_LIBS; do - cp -p obj-*/dist/bin/$LIB $MARTOOLS/ - done -[% END %] -[% IF c("var/windows") %] - cp -p obj-*/dist/bin/signmar.exe $MARTOOLS/ - cp -p obj-*/dist/bin/certutil.exe $MARTOOLS/ - cp -p obj-*/dist/bin/modutil.exe $MARTOOLS/ - cp -p obj-*/dist/bin/pk12util.exe $MARTOOLS/ - cp -p obj-*/dist/bin/shlibsign.exe $MARTOOLS/ - NSS_LIBS="freebl3.dll mozglue.dll nss3.dll nssckbi.dll softokn3.dll" - for LIB in $NSS_LIBS; do +[% IF c("var/updater_enabled") -%] + # Make MAR-based update tools available for use during the bundle phase. + # Note that mar and mbsdiff are standalone tools, compiled for the build + # host's architecture. We also include signmar, certutil, and the libraries + # they require; these utilities and libraries are built for the target + # architecture. + MARTOOLS=$distdir/mar-tools + mkdir -p $MARTOOLS + cp -p config/createprecomplete.py $MARTOOLS/ + cp -p tools/update-packaging/*.sh $MARTOOLS/ + cp -p obj-*/dist/host/bin/mar $MARTOOLS/ + cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ + [% IF c("var/linux") || c("var/macos") %] + cp -p obj-*/dist/bin/signmar $MARTOOLS/ + cp -p obj-*/dist/bin/certutil $MARTOOLS/ + cp -p obj-*/dist/bin/modutil $MARTOOLS/ + cp -p obj-*/dist/bin/pk12util $MARTOOLS/ + cp -p obj-*/dist/bin/shlibsign $MARTOOLS/ + [% IF c("var/linux") %] + NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssckbi.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" + NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" + [% ELSE %] + NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssckbi.dylib libsoftokn3.dylib" + # No NSPR_LIBS for macOS + NSPR_LIBS="" + [% END %] + for LIB in $NSS_LIBS $NSPR_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/ - done -[% END %] + done + [% END %] + [% IF c("var/windows") %] + cp -p obj-*/dist/bin/signmar.exe $MARTOOLS/ + cp -p obj-*/dist/bin/certutil.exe $MARTOOLS/ + cp -p obj-*/dist/bin/modutil.exe $MARTOOLS/ + cp -p obj-*/dist/bin/pk12util.exe $MARTOOLS/ + cp -p obj-*/dist/bin/shlibsign.exe $MARTOOLS/ + NSS_LIBS="freebl3.dll mozglue.dll nss3.dll nssckbi.dll softokn3.dll" + for LIB in $NSS_LIBS; do + cp -p obj-*/dist/bin/$LIB $MARTOOLS/ + done + [% END %] +[% END -%] cd $distdir @@ -281,7 +285,7 @@ cd $distdir mkdir -p $distdir/Debug/Browser # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) - for LIB in Browser/*.so Browser/firefox.real Browser/plugin-container Browser/updater + for LIB in Browser/*.so "Browser/[% c('var/exe_name') %].real" Browser/plugin-container [% IF c("var/updater_enabled") -%]Browser/updater[% END %] do objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB @@ -311,6 +315,16 @@ END; [% IF c("var/linux") %] /var/tmp/dist/gcc/bin/g++ $rootdir/abicheck.cc -o Browser/abicheck -std=c++17 + [% IF !c("var/torbrowser") %] + libdest=Browser/libstdc++ + mkdir -p "$libdest" + # FIXME: tor-browser-build#40749 + cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.* "$libdest" + [% IF c("var/asan") -%] + cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libasan.so.* "$libdest" + cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libubsan.so.* "$libdest" + [% END -%] + [% END %] [% END %] [% c('tar', { @@ -331,10 +345,12 @@ END; [% END %] [% END %] -[% c('zip', { - zip_src => [ 'mar-tools' ], - zip_args => dest_dir _ '/' _ c('filename') _ '/' _ c('var/martools_filename'), - }) %] +[% IF c("var/updater_enabled") -%] + [% c('zip', { + zip_src => [ 'mar-tools' ], + zip_args => dest_dir _ '/' _ c('filename') _ '/' _ c('var/martools_filename'), + }) %] +[% END -%] [% IF c("var/build_infos_json") -%] cat > "[% dest_dir _ '/' _ c('filename') _ '/build-infos.json' %]" << EOF_BUILDINFOS ===================================== projects/firefox/config ===================================== @@ -15,7 +15,7 @@ var: firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_branch: '12.5-1' browser_build: 1 - branding_directory: 'browser/branding/tb-alpha' + branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_osname: '[% c("var/osname") %]' deps: @@ -65,15 +65,15 @@ targets: # basebrowser tag always has a -build1 suffix git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]-build1' - release: - var: - branding_directory: 'browser/branding/tb-release' - nightly: git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]' tag_gpg_id: 0 + + privacybrowser: + git_url: git@gitlab.torproject.org:tpo/applications/privacy-browser.git var: - branding_directory: 'browser/branding/tb-nightly' + branding_directory_prefix: 'pb' + browser_branch: '12.0-1' linux-x86_64: var: @@ -92,6 +92,7 @@ targets: - libasound2-dev # To support Wayland mode - libdrm-dev + libdir: lib64 linux-i686: var: @@ -111,6 +112,7 @@ targets: - libasound2-dev:i386 # To support Wayland mode - libdrm-dev:i386 + libdir: lib32 macos: var: @@ -175,8 +177,6 @@ input_files: - torbrowser-windows-x86_64 - filename: abicheck.cc enable: '[% c("var/linux") %]' - - filename: start-firefox - enable: '[% c("var/linux") %]' - project: translation name: translation-base-browser pkg_type: base-browser ===================================== projects/firefox/start-firefox ===================================== @@ -15,9 +15,11 @@ add_LD_LIBRARY_PATH() { # that instead of the bundled version. "$basedir/abicheck" >/dev/null 2>&1 if [ $? -ne 0 ]; then - add_LD_LIBRARY_PATH "$basedir/TorBrowser/Tor/libstdc++/" + add_LD_LIBRARY_PATH "$basedir/[% IF c("var/tor-browser") -%]TorBrowser/Tor/[% END -%]libstdc++/" fi +[% IF c("var/tor-browser") -%] add_LD_LIBRARY_PATH "$basedir/TorBrowser/Tor/" +[% END -%] export LD_LIBRARY_PATH -exec "$basedir/firefox.real" "$@" +exec "$basedir/[% c("var/exe_name") %].real" "$@" ===================================== projects/release/config ===================================== @@ -53,10 +53,10 @@ targets: asan-build: '-asan' browser-linux-i686: var: - browser-linux-i686: 1 + browser-linux-i686: '[% c("var/browser_type") != "privacybrowser" %]' browser-windows-i686: var: - browser-windows-i686: 1 + browser-windows-i686: '[% c("var/browser_type") != "privacybrowser" %]' browser-windows-x86_64: var: browser-windows-x86_64: 1 @@ -93,6 +93,9 @@ targets: basebrowser: var: browser_type: basebrowser + privacybrowser: + var: + browser_type: privacybrowser release: var: ===================================== rbm.conf ===================================== @@ -75,6 +75,7 @@ var: torbrowser_build: 'build1' torbrowser_incremental_from: - 12.5a1 + updater_enabled: 1 build_mar: 1 # By default, we sort the list of installed packages. This allows sharing # containers with identical list of packages, even if they are not listed @@ -94,6 +95,7 @@ var: [% SET step = c("step") -%] [% c(step, { filename => 'f', output_dir => '/out', norec => {} }) %] + exe_name: firefox locale_ja: ja locales: - ar @@ -234,6 +236,17 @@ targets: projectname: basebrowser Project_Name: 'Base Browser' ProjectName: BaseBrowser + updater_enabled: 0 + + privacybrowser: + var: + privacy-browser: 1 + project-name: privacy-browser + projectname: privacybrowser + Project_Name: 'Privacy Browser' + ProjectName: PrivacyBrowser + exe_name: privacybrowser + updater_enabled: 0 torbrowser-testbuild: - testbuild @@ -243,6 +256,10 @@ targets: - testbuild - alpha - basebrowser + privacybrowser-testbuild: + - testbuild + - alpha + - privacybrowser testbuild: var: testbuild: 1 @@ -368,6 +385,10 @@ targets: - linux-x86_64 - linux - basebrowser + privacybrowser-linux-x86_64: + - linux-x86_64 + - linux + - privacybrowser torbrowser-linux-x86_64-asan: - linux-asan - linux-x86_64 @@ -378,6 +399,11 @@ targets: - linux-x86_64 - linux - basebrowser + privacybrowser-linux-x86_64-asan: + - linux-asan + - linux-x86_64 + - linux + - privacybrowser torbrowser-linux-i686: - linux-i686 - linux @@ -474,6 +500,10 @@ targets: - windows-x86_64 - windows - basebrowser + privacybrowser-windows-x86_64: + - windows-x86_64 + - windows + - privacybrowser windows-x86_64: arch: x86_64 var: @@ -537,6 +567,19 @@ targets: - macos-aarch64 - macos - basebrowser + privacybrowser-macos: + - macos-universal + - macos-x86_64 + - macos + - privacybrowser + privacybrowser-macos-x86_64: + - macos-x86_64 + - macos + - privacybrowser + privacybrowser-macos-aarch64: + - macos-aarch64 + - macos + - privacybrowser macos-universal: var: macos_universal: 1 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40751: Fix make signtag-* after #40737
by boklm (＠boklm) 26 Jan '23

26 Jan '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 49221734 by Nicolas Vigier at 2023-01-26T17:14:56+01:00 Bug 40751: Fix make signtag-* after #40737 - - - - - 1 changed file: - Makefile Changes: ===================================== Makefile ===================================== @@ -181,10 +181,10 @@ torbrowser-testbuild-src: submodule-update $(rbm) build release --target testbuild --target browser-src-testbuild --target torbrowser signtag-release: submodule-update - $(rbm) build release --step signtag --target release + $(rbm) build release --step signtag --target release --target torbrowser signtag-alpha: submodule-update - $(rbm) build release --step signtag --target alpha + $(rbm) build release --step signtag --target alpha --target torbrowser incrementals-release: submodule-update $(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target torbrowser View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] Bug 41565: Gate Telemetry Tasks behind MOZ_TELEMETRY_REPORTING
by Pier Angelo Vendrame (＠pierov) 26 Jan '23

26 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 47eb7d30 by cypherpunks1 at 2023-01-26T08:51:50+00:00 Bug 41565: Gate Telemetry Tasks behind MOZ_TELEMETRY_REPORTING - - - - - 4 changed files: - browser/base/content/browser.js - browser/components/BrowserGlue.jsm - toolkit/components/telemetry/app/TelemetryEnvironment.jsm - toolkit/xre/nsAppRunner.cpp Changes: ===================================== browser/base/content/browser.js ===================================== @@ -6053,6 +6053,7 @@ var TabsProgressListener = { // Collect telemetry data about tab load times. if ( + AppConstants.MOZ_TELEMETRY_REPORTING && aWebProgress.isTopLevel && (!aRequest.originalURI || aRequest.originalURI.scheme != "about") ) { ===================================== browser/components/BrowserGlue.jsm ===================================== @@ -1721,7 +1721,9 @@ BrowserGlue.prototype = { this._firstWindowTelemetry(aWindow); this._firstWindowLoaded(); - this._collectStartupConditionsTelemetry(); + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + this._collectStartupConditionsTelemetry(); + } // Set the default favicon size for UI views that use the page-icon protocol. PlacesUtils.favicons.setDefaultIconURIPreferredSize( @@ -2920,13 +2922,21 @@ BrowserGlue.prototype = { } }, - () => BrowserUsageTelemetry.reportProfileCount(), + () => { + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + BrowserUsageTelemetry.reportProfileCount(); + } + }, () => OsEnvironment.reportAllowedAppSources(), () => Services.search.runBackgroundChecks(), - () => BrowserUsageTelemetry.reportInstallationTelemetry(), + () => { + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + BrowserUsageTelemetry.reportInstallationTelemetry(); + } + }, ]; for (let task of idleTasks) { ===================================== toolkit/components/telemetry/app/TelemetryEnvironment.jsm ===================================== @@ -973,7 +973,9 @@ function EnvironmentCache() { p.push(this._addonBuilder.init()); this._currentEnvironment.profile = {}; - p.push(this._updateProfile()); + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + p.push(this._updateProfile()); + } if (AppConstants.MOZ_BUILD_APP == "browser") { p.push(this._loadAttributionAsync()); } ===================================== toolkit/xre/nsAppRunner.cpp ===================================== @@ -2886,7 +2886,9 @@ static ReturnAbortOnError ProfileErrorDialog(nsIFile* aProfileDir, rv = xpcom.Initialize(); NS_ENSURE_SUCCESS(rv, rv); +#if defined(MOZ_TELEMETRY_REPORTING) if (aProfileDir) mozilla::Telemetry::WriteFailedProfileLock(aProfileDir); +#endif rv = xpcom.SetWindowCreator(aNative); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/47eb7d3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/47eb7d3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.0-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 26 Jan '23

26 Jan '23

Pier Angelo Vendrame pushed to branch base-browser-102.7.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 3a562f05 by Pier Angelo Vendrame at 2023-01-26T08:05:13+00:00 fixup! Firefox preference overrides. Bug 40763: Stop using remote localized files in CFR (cherry picked from commit d9d4129b547e88bc8037a18b4dcc4868a8d009a1) - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -171,6 +171,9 @@ pref("browser.newtabpage.activity-stream.default.sites", ""); pref("browser.newtabpage.activity-stream.feeds.telemetry", false); pref("browser.newtabpage.activity-stream.telemetry", false); +// Disable fetching asrouter.ftl and related console errors (tor-browser#40763). +pref("browser.newtabpage.activity-stream.asrouter.useRemoteL10n", false); + // Disable moreFromMozilla pane in the preferences/settings (tor-browser#41292). pref("browser.preferences.moreFromMozilla", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3a562f0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3a562f0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.0-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 26 Jan '23

26 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 3a194dcd by Pier Angelo Vendrame at 2023-01-26T08:04:56+00:00 fixup! Firefox preference overrides. Bug 40763: Stop using remote localized files in CFR (cherry picked from commit d9d4129b547e88bc8037a18b4dcc4868a8d009a1) - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -171,6 +171,9 @@ pref("browser.newtabpage.activity-stream.default.sites", ""); pref("browser.newtabpage.activity-stream.feeds.telemetry", false); pref("browser.newtabpage.activity-stream.telemetry", false); +// Disable fetching asrouter.ftl and related console errors (tor-browser#40763). +pref("browser.newtabpage.activity-stream.asrouter.useRemoteL10n", false); + // Disable moreFromMozilla pane in the preferences/settings (tor-browser#41292). pref("browser.preferences.moreFromMozilla", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3a194dc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3a194dc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 26 Jan '23

26 Jan '23

Pier Angelo Vendrame pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 69be75e3 by Pier Angelo Vendrame at 2023-01-26T08:01:15+00:00 fixup! Firefox preference overrides. Bug 40763: Stop using remote localized files in CFR (cherry picked from commit d9d4129b547e88bc8037a18b4dcc4868a8d009a1) - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -174,6 +174,9 @@ pref("browser.newtabpage.activity-stream.default.sites", ""); pref("browser.newtabpage.activity-stream.feeds.telemetry", false); pref("browser.newtabpage.activity-stream.telemetry", false); +// Disable fetching asrouter.ftl and related console errors (tor-browser#40763). +pref("browser.newtabpage.activity-stream.asrouter.useRemoteL10n", false); + // Disable moreFromMozilla pane in the preferences/settings (tor-browser#41292). pref("browser.preferences.moreFromMozilla", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/69be75e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/69be75e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 26 Jan '23

26 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: d9d4129b by Pier Angelo Vendrame at 2023-01-25T13:01:46+01:00 fixup! Firefox preference overrides. Bug 40763: Stop using remote localized files in CFR - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -174,6 +174,9 @@ pref("browser.newtabpage.activity-stream.default.sites", ""); pref("browser.newtabpage.activity-stream.feeds.telemetry", false); pref("browser.newtabpage.activity-stream.telemetry", false); +// Disable fetching asrouter.ftl and related console errors (tor-browser#40763). +pref("browser.newtabpage.activity-stream.asrouter.useRemoteL10n", false); + // Disable moreFromMozilla pane in the preferences/settings (tor-browser#41292). pref("browser.preferences.moreFromMozilla", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d9d4129… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d9d4129… 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, 12.5a2
by boklm (＠boklm) 25 Jan '23

25 Jan '23

boklm pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: c70dae25 by Nicolas Vigier at 2023-01-25T20:06:07+01:00 alpha: new version, 12.5a2 - - - - - 29 changed files: - update_3/alpha/.htaccess - − update_3/alpha/12.0a5-12.5a1-linux32-ALL.xml - − update_3/alpha/12.0a5-12.5a1-linux64-ALL.xml - − update_3/alpha/12.0a5-12.5a1-macos-ALL.xml - − update_3/alpha/12.0a5-12.5a1-win32-ALL.xml - − update_3/alpha/12.0a5-12.5a1-win64-ALL.xml - + update_3/alpha/12.5a1-12.5a2-linux32-ALL.xml - + update_3/alpha/12.5a1-12.5a2-linux64-ALL.xml - + update_3/alpha/12.5a1-12.5a2-win32-ALL.xml - + update_3/alpha/12.5a1-12.5a2-win64-ALL.xml - − update_3/alpha/12.5a1-linux32-ALL.xml - − update_3/alpha/12.5a1-linux64-ALL.xml - − update_3/alpha/12.5a1-macos-ALL.xml - − update_3/alpha/12.5a1-win32-ALL.xml - − update_3/alpha/12.5a1-win64-ALL.xml - + update_3/alpha/12.5a2-linux32-ALL.xml - + update_3/alpha/12.5a2-linux64-ALL.xml - + update_3/alpha/12.5a2-win32-ALL.xml - + update_3/alpha/12.5a2-win64-ALL.xml - update_3/alpha/download-android-aarch64.json - update_3/alpha/download-android-armv7.json - update_3/alpha/download-android-x86.json - update_3/alpha/download-android-x86_64.json - update_3/alpha/download-linux-i686.json - update_3/alpha/download-linux-x86_64.json - update_3/alpha/download-macos.json - update_3/alpha/download-windows-i686.json - update_3/alpha/download-windows-x86_64.json - update_3/alpha/downloads.json Changes: ===================================== update_3/alpha/.htaccess ===================================== @@ -2,28 +2,22 @@ RewriteEngine On # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory RewriteRule ^[^/]+/8\.0a[12345678]/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] -RewriteRule ^[^/]+/12.5a1/ no-update.xml [last] -RewriteRule ^Linux_x86-gcc3/12.0a5/ALL 12.0a5-12.5a1-linux32-ALL.xml [last] -RewriteRule ^Linux_x86-gcc3/[^/]+/ALL 12.5a1-linux32-ALL.xml [last] -RewriteRule ^Linux_x86-gcc3/ 12.5a1-linux32-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/12.0a5/ALL 12.0a5-12.5a1-linux64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 12.5a1-linux64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/ 12.5a1-linux64-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/12.0a5/ALL 12.0a5-12.5a1-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 12.5a1-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/ 12.5a1-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/12.0a5/ALL 12.0a5-12.5a1-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 12.5a1-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/ 12.5a1-macos-ALL.xml [last] -RewriteRule ^WINNT_x86-gcc3/12.0a5/ALL 12.0a5-12.5a1-win32-ALL.xml [last] -RewriteRule ^WINNT_x86-gcc3/[^/]+/ALL 12.5a1-win32-ALL.xml [last] -RewriteRule ^WINNT_x86-gcc3/ 12.5a1-win32-ALL.xml [last] -RewriteRule ^WINNT_x86-gcc3-x86/12.0a5/ALL 12.0a5-12.5a1-win32-ALL.xml [last] -RewriteRule ^WINNT_x86-gcc3-x86/[^/]+/ALL 12.5a1-win32-ALL.xml [last] -RewriteRule ^WINNT_x86-gcc3-x86/ 12.5a1-win32-ALL.xml [last] -RewriteRule ^WINNT_x86-gcc3-x64/12.0a5/ALL 12.0a5-12.5a1-win32-ALL.xml [last] -RewriteRule ^WINNT_x86-gcc3-x64/[^/]+/ALL 12.5a1-win32-ALL.xml [last] -RewriteRule ^WINNT_x86-gcc3-x64/ 12.5a1-win32-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/12.0a5/ALL 12.0a5-12.5a1-win64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 12.5a1-win64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/ 12.5a1-win64-ALL.xml [last] +RewriteRule ^[^/]+/12.5a2/ no-update.xml [last] +RewriteRule ^Linux_x86-gcc3/12.5a1/ALL 12.5a1-12.5a2-linux32-ALL.xml [last] +RewriteRule ^Linux_x86-gcc3/[^/]+/ALL 12.5a2-linux32-ALL.xml [last] +RewriteRule ^Linux_x86-gcc3/ 12.5a2-linux32-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/12.5a1/ALL 12.5a1-12.5a2-linux64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 12.5a2-linux64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/ 12.5a2-linux64-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3/12.5a1/ALL 12.5a1-12.5a2-win32-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3/[^/]+/ALL 12.5a2-win32-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3/ 12.5a2-win32-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x86/12.5a1/ALL 12.5a1-12.5a2-win32-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x86/[^/]+/ALL 12.5a2-win32-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x86/ 12.5a2-win32-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x64/12.5a1/ALL 12.5a1-12.5a2-win32-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x64/[^/]+/ALL 12.5a2-win32-ALL.xml [last] +RewriteRule ^WINNT_x86-gcc3-x64/ 12.5a2-win32-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/12.5a1/ALL 12.5a1-12.5a2-win64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 12.5a2-win64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/ 12.5a2-win64-ALL.xml [last] ===================================== update_3/alpha/12.0a5-12.5a1-linux32-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="12.5a1" appVersion="12.5a1" platformVersion="102.6.0" buildID="20220706020101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a1" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a1/tor-browser-linux32-12.5a…" hashFunction="SHA512" hashValue="55cb878db080d8150f41130195609a9a4a01bf040ebe7633b34fdae70a1eb2877172819021041435fc61bef5ae65bc4afe59cef2efbe9ef5eddc1114bea8d174" size="112397387" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a1/tor-browser-linux32-12.0a…" hashFunction="SHA512" hashValue="b4c70414ba7ac8f609b07572558b2faf51ce616e407cebbf7ea46affd148023d7ee827a7de9465994d638019d89c1269a14134ff8360c30af515c544ff8cf021" size="8912642" type="partial"></patch></update></updates> ===================================== update_3/alpha/12.0a5-12.5a1-linux64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="12.5a1" appVersion="12.5a1" platformVersion="102.6.0" buildID="20220706020101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a1" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a1/tor-browser-linux64-12.5a…" hashFunction="SHA512" hashValue="9fc89bd7841d943a138809cee6063980c7021544babcb7ccbd669e102b39cb3fa38d235a84789793067dc4de5141354f549fe4782a6c0d82d88dbe955b961fac" size="111817535" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a1/tor-browser-linux64-12.0a…" hashFunction="SHA512" hashValue="4275cd31ba06a3869b50eee83299cf8a5ac8d6453f420626c1fe173b81c2aed7f5a28915b22a3d7951beef9cdffbd71a1e9fdb6f7acdeb627519a4dddf06bf92" size="8296375" type="partial"></patch></update></updates> ===================================== update_3/alpha/12.0a5-12.5a1-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="12.5a1" appVersion="12.5a1" platformVersion="102.6.0" buildID="20220706020101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a1" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a1" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a1/tor-browser-macos-12.5a1_…" hashFunction="SHA512" hashValue="54e506ec0631cba27ca5d4d543b05ff4e525b5579eb61c8f7fd490f6098a105d16114cab8d5504cb1ba3e82c7cb932d7ec0b249810a986cbf6d326db2140bdcd" size="146125201" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a1/tor-browser-macos-12.0a5-…" hashFunction="SHA512" hashValue="35f6ab0975cbae485507441e09722745190acb72728e5decdbb671f8d734c326526b477dd912ae02ae50ac0a33503b32cf13987da491bf8f6dcd27b4862dd1d9" size="29946813" type="partial"></patch></update></updates> ===================================== update_3/alpha/12.0a5-12.5a1-win32-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="12.5a1" appVersion="12.5a1" platformVersion="102.6.0" buildID="20220706020101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a1" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a1" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a1/tor-browser-win32-12.5a1_…" hashFunction="SHA512" hashValue="5e1e09f4cd4e219be6076c4dd8dec7a6b7e3c485c086cff66203e8a3717b00e0c713238012999e507a97f0bbe9efc58a8de9401eac3bc3d1d0205885a97ebe45" size="99826366" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a1/tor-browser-win32-12.0a5-…" hashFunction="SHA512" hashValue="61351907d0400d122739aa8eaf57058013848b877c0d15013aadf9ed89da1c510a7389aa69aedef1db5c3ce5f8e170bf08ffe29fc0ff0bc6068109937a91fc29" size="9810219" type="partial"></patch></update></updates> ===================================== update_3/alpha/12.0a5-12.5a1-win64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="12.5a1" appVersion="12.5a1" platformVersion="102.6.0" buildID="20220706020101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a1" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a1" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a1/tor-browser-win64-12.5a1_…" hashFunction="SHA512" hashValue="22cd2ed84f5787c243bea9f36f590765a9e9596b6c3c04ac7442e036b7b9f22de3e8c3e0e9a2956085422760df78e3efb5f8347e4668628c4d35cceaf2831aa0" size="100285308" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a1/tor-browser-win64-12.0a5-…" hashFunction="SHA512" hashValue="4939406d60d2d4c538fe03f4dd03e2b54f937c510a54c0038f6c01234e2406976a8cf1322a33a40ce899b8ae5d14f68233318307b607f896e4d4138408118299" size="8773997" type="partial"></patch></update></updates> ===================================== update_3/alpha/12.5a1-12.5a2-linux32-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="12.5a2" appVersion="12.5a2" platformVersion="102.7.0" buildID="20230706030101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a2" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a2" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a2/tor-browser-linux32-12.5a…" hashFunction="SHA512" hashValue="f5bf07f5a8b2456c4579370b6a3ba5bcaf70d27213a710c81bbcef52976d69b349cc2df6a31f26bc18031e782b95cf27c711c6df98772d72342f256c398e00c7" size="112946834" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a2/tor-browser-linux32-12.5a…" hashFunction="SHA512" hashValue="e0f1650ba1ca5ec1476197c81a52596f8077ca692762717f797cf35c80c47b6105423d6adc85dde8188a173dc1156c32ecbb6934ce520aac01187b9e53485978" size="8121180" type="partial"></patch></update></updates> ===================================== update_3/alpha/12.5a1-12.5a2-linux64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="12.5a2" appVersion="12.5a2" platformVersion="102.7.0" buildID="20230706030101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a2" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a2" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a2/tor-browser-linux64-12.5a…" hashFunction="SHA512" hashValue="c10986b1ee838a29089514edc391b8dde1ccd30c3446f6715520e27d8e9b3d373700441bf7b922b8fb30c9d8b7b1e124bd2566fc1a752f0007e8618cb6373beb" size="112370570" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a2/tor-browser-linux64-12.5a…" hashFunction="SHA512" hashValue="2eb2278a05a1ee587bd467db69702c916ca2d5dcd21091dbee92be0c5fe891ac7c60a1b683f04dcf534327dfc5f61543352830d5d5572ad9a705757f7974ff8b" size="7647523" type="partial"></patch></update></updates> ===================================== update_3/alpha/12.5a1-12.5a2-win32-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="12.5a2" appVersion="12.5a2" platformVersion="102.7.0" buildID="20230706030101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a2" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a2" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a2/tor-browser-win32-12.5a2_…" hashFunction="SHA512" hashValue="0bc33a6dc138d3d9c4f3db1b7b363ebb98b5e2e8255c6ab74ebad2767b56d26b084a87ef713ec991d0a3d51aa7b7551ced791e6d490b22062b069d51b6496790" size="100378977" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a2/tor-browser-win32-12.5a1-…" hashFunction="SHA512" hashValue="2e3e1b2f68784deeadbaee3ffba2e358f72a4ca51e8af9e367095a315568526432f62a771da89d9a428b101386165c096417a174cd9c40473b5e884e77363b54" size="9215003" type="partial"></patch></update></updates> ===================================== update_3/alpha/12.5a1-12.5a2-win64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="12.5a2" appVersion="12.5a2" platformVersion="102.7.0" buildID="20230706030101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a2" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a2" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a2/tor-browser-win64-12.5a2_…" hashFunction="SHA512" hashValue="8ce0399863b65ab0ebaf0531544653f65be6c192d241c781e0cbeb4decef188988f061960dee3397c7aed3cc5d0828c5bcb141347b79e541235868bf902cae51" size="100840495" type="complete"></patch><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a2/tor-browser-win64-12.5a1-…" hashFunction="SHA512" hashValue="711fef7a36720f64d07e9f194e65d63e9b54dec620f64661b6c030476a98095914e4c62242990d95a7620de66b0a4182c84948c043abe7f876af335057b6f664" size="8332677" type="partial"></patch></update></updates> ===================================== update_3/alpha/12.5a1-linux32-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="12.5a1" appVersion="12.5a1" platformVersion="102.6.0" buildID="20220706020101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a1" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a1/tor-browser-linux32-12.5a…" hashFunction="SHA512" hashValue="55cb878db080d8150f41130195609a9a4a01bf040ebe7633b34fdae70a1eb2877172819021041435fc61bef5ae65bc4afe59cef2efbe9ef5eddc1114bea8d174" size="112397387" type="complete"></patch></update></updates> ===================================== update_3/alpha/12.5a1-linux64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="12.5a1" appVersion="12.5a1" platformVersion="102.6.0" buildID="20220706020101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a1" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a1/tor-browser-linux64-12.5a…" hashFunction="SHA512" hashValue="9fc89bd7841d943a138809cee6063980c7021544babcb7ccbd669e102b39cb3fa38d235a84789793067dc4de5141354f549fe4782a6c0d82d88dbe955b961fac" size="111817535" type="complete"></patch></update></updates> ===================================== update_3/alpha/12.5a1-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="12.5a1" appVersion="12.5a1" platformVersion="102.6.0" buildID="20220706020101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a1" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a1" minSupportedOSVersion="16.0.0"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a1/tor-browser-macos-12.5a1_…" hashFunction="SHA512" hashValue="54e506ec0631cba27ca5d4d543b05ff4e525b5579eb61c8f7fd490f6098a105d16114cab8d5504cb1ba3e82c7cb932d7ec0b249810a986cbf6d326db2140bdcd" size="146125201" type="complete"></patch></update></updates> ===================================== update_3/alpha/12.5a1-win32-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="12.5a1" appVersion="12.5a1" platformVersion="102.6.0" buildID="20220706020101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a1" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a1" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a1/tor-browser-win32-12.5a1_…" hashFunction="SHA512" hashValue="5e1e09f4cd4e219be6076c4dd8dec7a6b7e3c485c086cff66203e8a3717b00e0c713238012999e507a97f0bbe9efc58a8de9401eac3bc3d1d0205885a97ebe45" size="99826366" type="complete"></patch></update></updates> ===================================== update_3/alpha/12.5a1-win64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="12.5a1" appVersion="12.5a1" platformVersion="102.6.0" buildID="20220706020101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a1" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a1" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a1/tor-browser-win64-12.5a1_…" hashFunction="SHA512" hashValue="22cd2ed84f5787c243bea9f36f590765a9e9596b6c3c04ac7442e036b7b9f22de3e8c3e0e9a2956085422760df78e3efb5f8347e4668628c4d35cceaf2831aa0" size="100285308" type="complete"></patch></update></updates> ===================================== update_3/alpha/12.5a2-linux32-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="12.5a2" appVersion="12.5a2" platformVersion="102.7.0" buildID="20230706030101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a2" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a2" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a2/tor-browser-linux32-12.5a…" hashFunction="SHA512" hashValue="f5bf07f5a8b2456c4579370b6a3ba5bcaf70d27213a710c81bbcef52976d69b349cc2df6a31f26bc18031e782b95cf27c711c6df98772d72342f256c398e00c7" size="112946834" type="complete"></patch></update></updates> ===================================== update_3/alpha/12.5a2-linux64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="12.5a2" appVersion="12.5a2" platformVersion="102.7.0" buildID="20230706030101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a2" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a2" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a2/tor-browser-linux64-12.5a…" hashFunction="SHA512" hashValue="c10986b1ee838a29089514edc391b8dde1ccd30c3446f6715520e27d8e9b3d373700441bf7b922b8fb30c9d8b7b1e124bd2566fc1a752f0007e8618cb6373beb" size="112370570" type="complete"></patch></update></updates> ===================================== update_3/alpha/12.5a2-win32-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="12.5a2" appVersion="12.5a2" platformVersion="102.7.0" buildID="20230706030101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a2" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a2" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a2/tor-browser-win32-12.5a2_…" hashFunction="SHA512" hashValue="0bc33a6dc138d3d9c4f3db1b7b363ebb98b5e2e8255c6ab74ebad2767b56d26b084a87ef713ec991d0a3d51aa7b7551ced791e6d490b22062b069d51b6496790" size="100378977" type="complete"></patch></update></updates> ===================================== update_3/alpha/12.5a2-win64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="12.5a2" appVersion="12.5a2" platformVersion="102.7.0" buildID="20230706030101" detailsURL="https://blog.torproject.org/new-release-tor-browser-125a2" actions="showURL" openURL="https://blog.torproject.org/new-release-tor-browser-125a2" minSupportedOSVersion="6.1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.torproject.org/aus1/torbrowser/12.5a2/tor-browser-win64-12.5a2_…" hashFunction="SHA512" hashValue="8ce0399863b65ab0ebaf0531544653f65be6c192d241c781e0cbeb4decef188988f061960dee3397c7aed3cc5d0828c5bcb141347b79e541235868bf902cae51" size="100840495" type="complete"></patch></update></updates> ===================================== update_3/alpha/download-android-aarch64.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/12.5a1/tor-browser-12.5a1-android-aa…","git_tag":"tbb-12.5a1-build1","sig":"https://dist.torproject.org/torbrowser/12.5a1/tor-browser-12.5a1-android-aa…","version":"12.5a1"} +{"binary":"https://dist.torproject.org/torbrowser/12.5a2/tor-browser-12.5a2-android-aa…","git_tag":"tbb-12.5a2-build1","sig":"https://dist.torproject.org/torbrowser/12.5a2/tor-browser-12.5a2-android-aa…","version":"12.5a2"} \ No newline at end of file ===================================== update_3/alpha/download-android-armv7.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/12.5a1/tor-browser-12.5a1-android-ar…","git_tag":"tbb-12.5a1-build1","sig":"https://dist.torproject.org/torbrowser/12.5a1/tor-browser-12.5a1-android-ar…","version":"12.5a1"} +{"binary":"https://dist.torproject.org/torbrowser/12.5a2/tor-browser-12.5a2-android-ar…","git_tag":"tbb-12.5a2-build1","sig":"https://dist.torproject.org/torbrowser/12.5a2/tor-browser-12.5a2-android-ar…","version":"12.5a2"} \ No newline at end of file ===================================== update_3/alpha/download-android-x86.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/12.5a1/tor-browser-12.5a1-android-x8…","git_tag":"tbb-12.5a1-build1","sig":"https://dist.torproject.org/torbrowser/12.5a1/tor-browser-12.5a1-android-x8…","version":"12.5a1"} \ No newline at end of file +{"binary":"https://dist.torproject.org/torbrowser/12.5a2/tor-browser-12.5a2-android-x8…","git_tag":"tbb-12.5a2-build1","sig":"https://dist.torproject.org/torbrowser/12.5a2/tor-browser-12.5a2-android-x8…","version":"12.5a2"} \ No newline at end of file ===================================== update_3/alpha/download-android-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/12.5a1/tor-browser-12.5a1-android-x8…","git_tag":"tbb-12.5a1-build1","sig":"https://dist.torproject.org/torbrowser/12.5a1/tor-browser-12.5a1-android-x8…","version":"12.5a1"} \ No newline at end of file +{"binary":"https://dist.torproject.org/torbrowser/12.5a2/tor-browser-12.5a2-android-x8…","git_tag":"tbb-12.5a2-build1","sig":"https://dist.torproject.org/torbrowser/12.5a2/tor-browser-12.5a2-android-x8…","version":"12.5a2"} \ No newline at end of file ===================================== update_3/alpha/download-linux-i686.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/12.5a1/tor-browser-linux32-12.5a1_AL…","git_tag":"tbb-12.5a1-build1","sig":"https://dist.torproject.org/torbrowser/12.5a1/tor-browser-linux32-12.5a1_AL…","version":"12.5a1"} \ No newline at end of file +{"binary":"https://dist.torproject.org/torbrowser/12.5a2/tor-browser-linux32-12.5a2_AL…","git_tag":"tbb-12.5a2-build1","sig":"https://dist.torproject.org/torbrowser/12.5a2/tor-browser-linux32-12.5a2_AL…","version":"12.5a2"} \ No newline at end of file ===================================== update_3/alpha/download-linux-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/12.5a1/tor-browser-linux64-12.5a1_AL…","git_tag":"tbb-12.5a1-build1","sig":"https://dist.torproject.org/torbrowser/12.5a1/tor-browser-linux64-12.5a1_AL…","version":"12.5a1"} \ No newline at end of file +{"binary":"https://dist.torproject.org/torbrowser/12.5a2/tor-browser-linux64-12.5a2_AL…","git_tag":"tbb-12.5a2-build1","sig":"https://dist.torproject.org/torbrowser/12.5a2/tor-browser-linux64-12.5a2_AL…","version":"12.5a2"} \ No newline at end of file ===================================== update_3/alpha/download-macos.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/12.5a1/TorBrowser-12.5a1-macos_ALL.d…","git_tag":"tbb-12.5a1-build1","sig":"https://dist.torproject.org/torbrowser/12.5a1/TorBrowser-12.5a1-macos_ALL.d…","version":"12.5a1"} \ No newline at end of file +{"binary":"https://dist.torproject.org/torbrowser/12.5a2/TorBrowser-12.5a2-macos_ALL.d…","git_tag":"tbb-12.5a2-build1","sig":"https://dist.torproject.org/torbrowser/12.5a2/TorBrowser-12.5a2-macos_ALL.d…","version":"12.5a2"} \ No newline at end of file ===================================== update_3/alpha/download-windows-i686.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/12.5a1/torbrowser-install-12.5a1_ALL…","git_tag":"tbb-12.5a1-build1","sig":"https://dist.torproject.org/torbrowser/12.5a1/torbrowser-install-12.5a1_ALL…","version":"12.5a1"} \ No newline at end of file +{"binary":"https://dist.torproject.org/torbrowser/12.5a2/torbrowser-install-12.5a2_ALL…","git_tag":"tbb-12.5a2-build1","sig":"https://dist.torproject.org/torbrowser/12.5a2/torbrowser-install-12.5a2_ALL…","version":"12.5a2"} \ No newline at end of file ===================================== update_3/alpha/download-windows-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://dist.torproject.org/torbrowser/12.5a1/torbrowser-install-win64-12.5…","git_tag":"tbb-12.5a1-build1","sig":"https://dist.torproject.org/torbrowser/12.5a1/torbrowser-install-win64-12.5…","version":"12.5a1"} \ No newline at end of file +{"binary":"https://dist.torproject.org/torbrowser/12.5a2/torbrowser-install-win64-12.5…","git_tag":"tbb-12.5a2-build1","sig":"https://dist.torproject.org/torbrowser/12.5a2/torbrowser-install-win64-12.5…","version":"12.5a2"} \ No newline at end of file ===================================== update_3/alpha/downloads.json ===================================== @@ -1 +1 @@ -{"downloads":{"linux32":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/12.5a1/tor-browser-linux32-12.5a1_AL…","sig":"https://dist.torproject.org/torbrowser/12.5a1/tor-browser-linux32-12.5a1_AL…"}},"linux64":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/12.5a1/tor-browser-linux64-12.5a1_AL…","sig":"https://dist.torproject.org/torbrowser/12.5a1/tor-browser-linux64-12.5a1_AL…"}},"macos":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/12.5a1/TorBrowser-12.5a1-macos_ALL.d…","sig":"https://dist.torproject.org/torbrowser/12.5a1/TorBrowser-12.5a1-macos_ALL.d…"}},"win32":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/12.5a1/torbrowser-install-12.5a1_ALL…","sig":"https://dist.torproject.org/torbrowser/12.5a1/torbrowser-install-12.5a1_ALL…"}},"win64":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/12.5a1/torbrowser-install-win64-12.5…","sig":"https://dist.torproject.org/torbrowser/12.5a1/torbrowser-install-win64-12.5…"}}},"tag":"tbb-12.5a1-build1","version":"12.5a1"} \ No newline at end of file +{"downloads":{"linux32":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/12.5a2/tor-browser-linux32-12.5a2_AL…","sig":"https://dist.torproject.org/torbrowser/12.5a2/tor-browser-linux32-12.5a2_AL…"}},"linux64":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/12.5a2/tor-browser-linux64-12.5a2_AL…","sig":"https://dist.torproject.org/torbrowser/12.5a2/tor-browser-linux64-12.5a2_AL…"}},"macos":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/12.5a2/TorBrowser-12.5a2-macos_ALL.d…","sig":"https://dist.torproject.org/torbrowser/12.5a2/TorBrowser-12.5a2-macos_ALL.d…"}},"win32":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/12.5a2/torbrowser-install-12.5a2_ALL…","sig":"https://dist.torproject.org/torbrowser/12.5a2/torbrowser-install-12.5a2_ALL…"}},"win64":{"ALL":{"binary":"https://dist.torproject.org/torbrowser/12.5a2/torbrowser-install-win64-12.5…","sig":"https://dist.torproject.org/torbrowser/12.5a2/torbrowser-install-win64-12.5…"}}},"tag":"tbb-12.5a2-build1","version":"12.5a2"} \ No newline at end of file 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] Deleted tag privacy-browser-102.7.0esr-12.0-1-build1
by Pier Angelo Vendrame (＠pierov) 25 Jan '23

25 Jan '23

Pier Angelo Vendrame deleted tag privacy-browser-102.7.0esr-12.0-1-build1 at The Tor Project / Applications / Tor Browser -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag privacy-browser-102.7.0esr-12.0-1-build1
by Pier Angelo Vendrame (＠pierov) 25 Jan '23

25 Jan '23

Pier Angelo Vendrame pushed new tag privacy-browser-102.7.0esr-12.0-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/privacy-b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] 3 commits: fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (＠pierov) 24 Jan '23

24 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 9514e0c6 by cypherpunks1 at 2023-01-24T14:20:38+00:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Disable activity stream - - - - - fc08631d by cypherpunks1 at 2023-01-24T14:20:38+00:00 fixup! Bug 40002: Remove about:ion Remove this._monitorIonPref() and this._monitorIonStudies() from BrowserGlue - - - - - ad5720b0 by cypherpunks1 at 2023-01-24T14:20:39+00:00 fixup! Firefox preference overrides. Disable toolkit.telemetry.enabled on all builds, set webextensions.storage.sync.enabled to false - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - browser/components/BrowserGlue.jsm Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -119,7 +119,7 @@ pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false); // Make sure Unified Telemetry is really disabled, see: #18738. pref("toolkit.telemetry.unified", false); -pref("toolkit.telemetry.enabled", false); +pref("toolkit.telemetry.enabled", false, locked); pref("toolkit.telemetry.server", "data:,"); pref("toolkit.telemetry.archive.enabled", false); pref("toolkit.telemetry.updatePing.enabled", false); // Make sure updater telemetry is disabled; see #25909. @@ -419,6 +419,8 @@ pref("extensions.postDownloadThirdPartyPrompt", false); // Therefore, do not allow download of additional language packs. They are not a // privacy/security threat, we are disabling them for UX reasons. See bug 41377. pref("intl.multilingual.downloadEnabled", false); +// Disk activity: Disable storage.sync (tor-browser#41424) +pref("webextensions.storage.sync.enabled", false); // Toolbar layout pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"security-level-button\",\"new-identity-button\",\"downloads-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"currentVersion\":14,\"newElementCount\":1}"); ===================================== browser/components/BrowserGlue.jsm ===================================== @@ -21,9 +21,6 @@ XPCOMUtils.defineLazyModuleGetters(this, { ActorManagerParent: "resource://gre/modules/ActorManagerParent.jsm", AddonManager: "resource://gre/modules/AddonManager.jsm", AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm", - ASRouterDefaultConfig: - "resource://activity-stream/lib/ASRouterDefaultConfig.jsm", - ASRouterNewTabHook: "resource://activity-stream/lib/ASRouterNewTabHook.jsm", ASRouter: "resource://activity-stream/lib/ASRouter.jsm", AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm", BackgroundUpdate: "resource://gre/modules/BackgroundUpdate.jsm", @@ -738,27 +735,6 @@ let JSWINDOWACTORS = { matches: ["about:studies*"], }, - ASRouter: { - parent: { - moduleURI: "resource:///actors/ASRouterParent.jsm", - }, - child: { - moduleURI: "resource:///actors/ASRouterChild.jsm", - events: { - // This is added so the actor instantiates immediately and makes - // methods available to the page js on load. - DOMDocElementInserted: {}, - }, - }, - matches: [ - "about:home*", - "about:newtab*", - "about:welcome*", - "about:privatebrowsing", - ], - remoteTypes: ["privilegedabout"], - }, - SwitchDocumentDirection: { child: { moduleURI: "resource:///actors/SwitchDocumentDirectionChild.jsm", @@ -2058,7 +2034,6 @@ BrowserGlue.prototype = { () => NewTabUtils.uninit(), () => Normandy.uninit(), () => RFPHelper.uninit(), - () => ASRouterNewTabHook.destroy(), () => UpdateListener.reset(), () => OnionAliasStore.uninit(), ]; @@ -2400,8 +2375,6 @@ BrowserGlue.prototype = { this._monitorScreenshotsPref(); this._monitorWebcompatReporterPref(); this._monitorHTTPSOnlyPref(); - this._monitorIonPref(); - this._monitorIonStudies(); this._setupSearchDetection(); this._monitorGPCPref(); @@ -2797,12 +2770,6 @@ BrowserGlue.prototype = { }, }, - { - task: () => { - ASRouterNewTabHook.createInstance(ASRouterDefaultConfig()); - }, - }, - { condition: AppConstants.MOZ_UPDATE_AGENT, task: () => { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/56584b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/56584b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40752: Fix urls in download-android-*.json files
by boklm (＠boklm) 24 Jan '23

24 Jan '23

boklm pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 855a1723 by Nicolas Vigier at 2023-01-24T13:05:55+01:00 Bug 40752: Fix urls in download-android-*.json files Fix the regexp used to find android apk files (to exclude .apk.asc files). - - - - - 1 changed file: - tools/update-responses/update_responses Changes: ===================================== tools/update-responses/update_responses ===================================== @@ -170,7 +170,7 @@ sub get_perplatform_downloads { $os = 'windows-x86_64'; } elsif ($file =~ m/^$config->{appname_bundle_win32}-${version}_(.+).exe$/) { $os = 'windows-i686'; - } elsif ($file =~ m/^$config->{appname_bundle_android}-${version}-(android-armv7|android-x86|android-x86_64|android-aarch64)-multi.apk/) { + } elsif ($file =~ m/^$config->{appname_bundle_android}-${version}-(android-armv7|android-x86|android-x86_64|android-aarch64)-multi.apk$/) { $os = $1; } else { next; 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][main] Bug 40752: Fix urls in download-android-*.json files
by boklm (＠boklm) 24 Jan '23

24 Jan '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: f6f4afaa by Nicolas Vigier at 2023-01-24T13:04:03+01:00 Bug 40752: Fix urls in download-android-*.json files Fix the regexp used to find android apk files (to exclude .apk.asc files). - - - - - 1 changed file: - tools/update-responses/update_responses Changes: ===================================== tools/update-responses/update_responses ===================================== @@ -170,7 +170,7 @@ sub get_perplatform_downloads { $os = 'windows-x86_64'; } elsif ($file =~ m/^$config->{appname_bundle_win32}-${version}_(.+).exe$/) { $os = 'windows-i686'; - } elsif ($file =~ m/^$config->{appname_bundle_android}-${version}-(android-armv7|android-x86|android-x86_64|android-aarch64)-multi.apk/) { + } elsif ($file =~ m/^$config->{appname_bundle_android}-${version}-(android-armv7|android-x86|android-x86_64|android-aarch64)-multi.apk$/) { $os = $1; } else { next; 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/tor-browser][tor-browser-102.7.0esr-12.5-1] fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
by Pier Angelo Vendrame (＠pierov) 23 Jan '23

23 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 56584b5d by Pier Angelo Vendrame at 2023-01-23T19:32:07+01:00 fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. Bug 41540: Do not show the build ID for alphas - - - - - 1 changed file: - browser/components/preferences/main.js Changes: ===================================== browser/components/preferences/main.js ===================================== @@ -556,14 +556,8 @@ var gMainPane = { // Initialize the Firefox Updates section. let version = AppConstants.TOR_BROWSER_VERSION; - // Include the build ID if this is an "a#" (nightly) build - if (/a\d+$/.test(version)) { - let buildID = Services.appinfo.appBuildID; - let year = buildID.slice(0, 4); - let month = buildID.slice(4, 6); - let day = buildID.slice(6, 8); - version += ` (${year}-${month}-${day})`; - } + // Tor Browser: do not include the build ID in our alphas, since they are + // not actually related to the build date. // Append "(32-bit)" or "(64-bit)" build architecture to the version number: let bundle = Services.strings.createBundle( View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/56584b5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/56584b5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.0-1] fixup! Add TorStrings module for localization
by Pier Angelo Vendrame (＠pierov) 23 Jan '23

23 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: c6a6f09b by emma peel at 2023-01-23T18:01:22+00:00 fixup! Add TorStrings module for localization replace with more common expression available in wikipedia. reported by translator dfiguera at https://hosted.weblate.org/translate/tor/tb-browseronboardingproperties/en/…, thanks! (cherry picked from commit ff331e83fd3ccced869cff76702eea320fe44e2f) - - - - - 1 changed file: - toolkit/torbutton/chrome/locale/en-US/browserOnboarding.properties Changes: ===================================== toolkit/torbutton/chrome/locale/en-US/browserOnboarding.properties ===================================== @@ -15,7 +15,7 @@ onboarding.tour-tor-privacy.button=Go to Tor Network onboarding.tour-tor-network=Tor Network onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. +onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no single point of failure or centralized entity you need to trust in order to enjoy the internet privately. onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings onboarding.tour-tor-network.button=Go to Circuit Display View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c6a6f09… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c6a6f09… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.5-1] fixup! Base Browser's .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 23 Jan '23

23 Jan '23

Pier Angelo Vendrame pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 07f08e2e by Pier Angelo Vendrame at 2023-01-23T18:59:27+01:00 fixup! Base Browser's .mozconfigs. Bug 41587: Disable the updater for Base Browser - - - - - 1 changed file: - browser/config/mozconfigs/base-browser Changes: ===================================== browser/config/mozconfigs/base-browser ===================================== @@ -16,6 +16,9 @@ ac_add_options --enable-rust-simd ac_add_options --enable-bundled-fonts +# See bug #41587 +ac_add_options --disable-updater + ac_add_options --disable-tests ac_add_options --disable-debug View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/07f08e2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/07f08e2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] 2 commits: fixup! Base Browser's .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 23 Jan '23

23 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: f22c8cc1 by Pier Angelo Vendrame at 2023-01-23T18:52:03+01:00 fixup! Base Browser's .mozconfigs. Bug 41587: Disable the updater for Base Browser - - - - - 3da2c5c8 by Pier Angelo Vendrame at 2023-01-23T18:52:04+01:00 fixup! TB3: Tor Browser's official .mozconfigs. Bug 41587: Disable the updater for Base Browser - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ff331e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ff331e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] fixup! Add TorStrings module for localization
by Pier Angelo Vendrame (＠pierov) 23 Jan '23

23 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: ff331e83 by emma peel at 2023-01-23T18:49:12+01:00 fixup! Add TorStrings module for localization replace with more common expression available in wikipedia. reported by translator dfiguera at https://hosted.weblate.org/translate/tor/tb-browseronboardingproperties/en/…, thanks! - - - - - 1 changed file: - toolkit/torbutton/chrome/locale/en-US/browserOnboarding.properties Changes: ===================================== toolkit/torbutton/chrome/locale/en-US/browserOnboarding.properties ===================================== @@ -15,7 +15,7 @@ onboarding.tour-tor-privacy.button=Go to Tor Network onboarding.tour-tor-network=Tor Network onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. +onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no single point of failure or centralized entity you need to trust in order to enjoy the internet privately. onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings onboarding.tour-tor-network.button=Go to Circuit Display View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ff331e8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ff331e8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40731: Update torbutton directory to apply namecoin-torbutton.patch
by boklm (＠boklm) 23 Jan '23

23 Jan '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 76fbfc74 by Nicolas Vigier at 2023-01-23T18:10:58+01:00 Bug 40731: Update torbutton directory to apply namecoin-torbutton.patch - - - - - 1 changed file: - projects/firefox/build Changes: ===================================== projects/firefox/build ===================================== @@ -94,7 +94,7 @@ fi [% END -%] [% IF c("var/namecoin") %] - pushd toolkit/torproject/torbutton + pushd toolkit/torbutton patch -p1 < $rootdir/namecoin-torbutton.patch popd [% END %] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… You're receiving this email because of your account on gitlab.torproject.org.

1 0