Pier Angelo Vendrame pushed to branch tor-browser-115.15.0esr-13.5-2 at The Tor Project / Applications / Tor Browser
Commits:
757b1f4d by Pier Angelo Vendrame at 2024-08-28T08:45:55+02:00
fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
Bug 42747: Discard unsupported updates earlier.
Firefox's updater has a function to select updates, which checks mainly
the version number.
Therefore, a more recent update that is unsupported will be chosen over
a compatible one.
We patch this to be able to provide an alternative update path to
Windows 7.
- - - - -
2f730245 by Pier Angelo Vendrame at 2024-08-28T08:45:55+02:00
fixup! Bug 19121: reinstate the update.xml hash check
Revert "Bug 19121: reinstate the update.xml hash check"
This reverts commit 39a712fbaf18cb64b6dc601c71bac82718de1a01.
- - - - -
3 changed files:
- toolkit/mozapps/update/UpdateService.sys.mjs
- toolkit/mozapps/update/UpdateTelemetry.sys.mjs
- toolkit/mozapps/update/nsIUpdateService.idl
Changes:
=====================================
toolkit/mozapps/update/UpdateService.sys.mjs
=====================================
@@ -2127,8 +2127,6 @@ function UpdatePatch(patch) {
}
break;
case "finalURL":
- case "hashFunction":
- case "hashValue":
case "state":
case "type":
case "URL":
@@ -2148,8 +2146,6 @@ UpdatePatch.prototype = {
// over writing nsIUpdatePatch attributes.
_attrNames: [
"errorCode",
- "hashFunction",
- "hashValue",
"finalURL",
"selected",
"size",
@@ -2163,8 +2159,6 @@ UpdatePatch.prototype = {
*/
serialize: function UpdatePatch_serialize(updates) {
var patch = updates.createElementNS(URI_UPDATE_NS, "patch");
- patch.setAttribute("hashFunction", this.hashFunction);
- patch.setAttribute("hashValue", this.hashValue);
patch.setAttribute("size", this.size);
patch.setAttribute("type", this.type);
patch.setAttribute("URL", this.URL);
@@ -3737,18 +3731,20 @@ UpdateService.prototype = {
switch (aUpdate.type) {
case "major":
- if (!majorUpdate) {
+ if (!majorUpdate || majorUpdate.unsupported) {
majorUpdate = aUpdate;
} else if (
+ !aUpdate.unsupported &&
vc.compare(majorUpdate.appVersion, aUpdate.appVersion) <= 0
) {
majorUpdate = aUpdate;
}
break;
case "minor":
- if (!minorUpdate) {
+ if (!minorUpdate || minorUpdate.unsupported) {
minorUpdate = aUpdate;
} else if (
+ !aUpdate.unsupported &&
vc.compare(minorUpdate.appVersion, aUpdate.appVersion) <= 0
) {
minorUpdate = aUpdate;
@@ -5792,56 +5788,7 @@ Downloader.prototype = {
}
LOG("Downloader:_verifyDownload downloaded size == expected size.");
- let fileStream = Cc[
- "@mozilla.org/network/file-input-stream;1"
- ].createInstance(Ci.nsIFileInputStream);
- fileStream.init(
- destination,
- FileUtils.MODE_RDONLY,
- FileUtils.PERMS_FILE,
- 0
- );
-
- let digest;
- try {
- let hash = Cc["@mozilla.org/security/hash;1"].createInstance(
- Ci.nsICryptoHash
- );
- var hashFunction =
- Ci.nsICryptoHash[this._patch.hashFunction.toUpperCase()];
- if (hashFunction == undefined) {
- throw Components.Exception("", Cr.NS_ERROR_UNEXPECTED);
- }
- hash.init(hashFunction);
- hash.updateFromStream(fileStream, -1);
- // NOTE: For now, we assume that the format of _patch.hashValue is hex
- // encoded binary (such as what is typically output by programs like
- // sha1sum). In the future, this may change to base64 depending on how
- // we choose to compute these hashes.
- hash = hash.finish(false);
- digest = Array.from(hash, (c, i) =>
- hash.charCodeAt(i).toString(16).padStart(2, "0")
- ).join("");
- } catch (e) {
- LOG(
- "Downloader:_verifyDownload - failed to compute hash of the downloaded update archive"
- );
- digest = "";
- }
-
- fileStream.close();
-
- if (digest == this._patch.hashValue.toLowerCase()) {
- LOG("Downloader:_verifyDownload hashes match.");
- return true;
- }
-
- LOG("Downloader:_verifyDownload hashes do not match. ");
- AUSTLMY.pingDownloadCode(
- this.isCompleteUpdate,
- AUSTLMY.DWNLD_ERR_VERIFY_NO_HASH_MATCH
- );
- return false;
+ return true;
},
/**
@@ -6477,9 +6424,6 @@ Downloader.prototype = {
" is higher than patch size: " +
this._patch.size
);
- // It's important that we use a different code than
- // NS_ERROR_CORRUPTED_CONTENT so that tests can verify the difference
- // between a hash error and a wrong download error.
AUSTLMY.pingDownloadCode(
this.isCompleteUpdate,
AUSTLMY.DWNLD_ERR_PATCH_SIZE_LARGER
@@ -6498,9 +6442,6 @@ Downloader.prototype = {
" is not equal to expected patch size: " +
this._patch.size
);
- // It's important that we use a different code than
- // NS_ERROR_CORRUPTED_CONTENT so that tests can verify the difference
- // between a hash error and a wrong download error.
AUSTLMY.pingDownloadCode(
this.isCompleteUpdate,
AUSTLMY.DWNLD_ERR_PATCH_SIZE_NOT_EQUAL
=====================================
toolkit/mozapps/update/UpdateTelemetry.sys.mjs
=====================================
@@ -190,7 +190,6 @@ export var AUSTLMY = {
DWNLD_ERR_VERIFY_NO_REQUEST: 13,
DWNLD_ERR_VERIFY_PATCH_SIZE_NOT_EQUAL: 14,
DWNLD_ERR_WRITE_FAILURE: 15,
- DWNLD_ERR_VERIFY_NO_HASH_MATCH: 16,
// Temporary failure code to see if there are failures without an update phase
DWNLD_UNKNOWN_PHASE_ERR_WRITE_FAILURE: 40,
=====================================
toolkit/mozapps/update/nsIUpdateService.idl
=====================================
@@ -39,17 +39,6 @@ interface nsIUpdatePatch : nsISupports
*/
attribute AString finalURL;
- /**
- * The hash function to use when determining this file's integrity
- */
- attribute AString hashFunction;
-
- /**
- * The value of the hash function named above that should be computed if
- * this file is not corrupt.
- */
- attribute AString hashValue;
-
/**
* The size of this file, in bytes.
*/
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6935ca…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6935ca…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser
Commits:
e4de0ac8 by Henry Wilkes at 2024-08-29T16:42:57+02:00
fixup! Bug 41568: Disable LaterRun
Bug 42630: Revert patch.
- - - - -
ae50f625 by Henry Wilkes at 2024-08-29T16:42:58+02:00
Bug 42630: Disable LaterRun module.
- - - - -
2 changed files:
- browser/components/BrowserContentHandler.sys.mjs
- browser/modules/LaterRun.sys.mjs
Changes:
=====================================
browser/components/BrowserContentHandler.sys.mjs
=====================================
@@ -774,8 +774,8 @@ nsBrowserContentHandler.prototype = {
additionalPage = Services.urlFormatter.formatURLPref(
"startup.homepage_welcome_url.additional"
);
- // Disable 'later run' pages for new profiles (tor-browser#41568)
- lazy.LaterRun.selfDestruct();
+ // Turn on 'later run' pages for new profiles.
+ lazy.LaterRun.enable(lazy.LaterRun.ENABLE_REASON_NEW_PROFILE);
break;
case OVERRIDE_NEW_MSTONE: {
// Check whether we will restore a session. If we will, we assume
=====================================
browser/modules/LaterRun.sys.mjs
=====================================
@@ -61,6 +61,20 @@ export let LaterRun = {
},
init(reason) {
+ // Keep disabled in Base Browser. See tor-browser#41568.
+ // NOTE: This means that users cannot benefit from feature prompts gated
+ // behind LaterRun.
+ // In mozilla ESR 128 it is only used in one place, and is gated behind a
+ // feature recommendation preference that we switch off in Base Browser
+ // anyway. See tor-browser#42630.
+ // But this decision should be reviewed. See tor-browser#43093.
+ Services.prefs.setBoolPref(kEnabledPref, false);
+ // Clear any preferences that may have been set before LaterRun was
+ // disabled.
+ Services.prefs.clearUserPref(kSessionCountPref);
+ Services.prefs.clearUserPref(kProfileCreationTime);
+ Services.prefs.clearUserPref(kUpdateAppliedTime);
+
if (!this.enabled) {
return;
}
@@ -99,11 +113,8 @@ export let LaterRun = {
return Services.prefs.getBoolPref(kEnabledPref, false);
},
- enable(reason) {
- if (!this.enabled) {
- Services.prefs.setBoolPref(kEnabledPref, true);
- this.init(reason);
- }
+ enable(_reason) {
+ // Keep disabled in Base Browser. See tor-browser#41568.
},
get hoursSinceInstall() {
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/07…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/07…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch base-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser
Commits:
44820468 by Henry Wilkes at 2024-08-29T16:42:37+02:00
fixup! Bug 41568: Disable LaterRun
Bug 42630: Revert patch.
- - - - -
d44ef5f7 by Henry Wilkes at 2024-08-29T16:42:41+02:00
Bug 42630: Disable LaterRun module.
- - - - -
2 changed files:
- browser/components/BrowserContentHandler.sys.mjs
- browser/modules/LaterRun.sys.mjs
Changes:
=====================================
browser/components/BrowserContentHandler.sys.mjs
=====================================
@@ -757,8 +757,8 @@ nsBrowserContentHandler.prototype = {
additionalPage = Services.urlFormatter.formatURLPref(
"startup.homepage_welcome_url.additional"
);
- // Disable 'later run' pages for new profiles (tor-browser#41568)
- lazy.LaterRun.selfDestruct();
+ // Turn on 'later run' pages for new profiles.
+ lazy.LaterRun.enable(lazy.LaterRun.ENABLE_REASON_NEW_PROFILE);
break;
case OVERRIDE_NEW_MSTONE: {
// Check whether we will restore a session. If we will, we assume
=====================================
browser/modules/LaterRun.sys.mjs
=====================================
@@ -61,6 +61,20 @@ export let LaterRun = {
},
init(reason) {
+ // Keep disabled in Base Browser. See tor-browser#41568.
+ // NOTE: This means that users cannot benefit from feature prompts gated
+ // behind LaterRun.
+ // In mozilla ESR 128 it is only used in one place, and is gated behind a
+ // feature recommendation preference that we switch off in Base Browser
+ // anyway. See tor-browser#42630.
+ // But this decision should be reviewed. See tor-browser#43093.
+ Services.prefs.setBoolPref(kEnabledPref, false);
+ // Clear any preferences that may have been set before LaterRun was
+ // disabled.
+ Services.prefs.clearUserPref(kSessionCountPref);
+ Services.prefs.clearUserPref(kProfileCreationTime);
+ Services.prefs.clearUserPref(kUpdateAppliedTime);
+
if (!this.enabled) {
return;
}
@@ -99,11 +113,8 @@ export let LaterRun = {
return Services.prefs.getBoolPref(kEnabledPref, false);
},
- enable(reason) {
- if (!this.enabled) {
- Services.prefs.setBoolPref(kEnabledPref, true);
- this.init(reason);
- }
+ enable(_reason) {
+ // Keep disabled in Base Browser. See tor-browser#41568.
},
get hoursSinceInstall() {
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8fe2c1…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8fe2c1…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser
Commits:
e85915bc by Henry Wilkes at 2024-08-29T15:11:30+01:00
fixup! Bug 41568: Disable LaterRun
Bug 42630: Revert patch.
- - - - -
8a110fc4 by Henry Wilkes at 2024-08-29T15:12:01+01:00
Bug 42630: Disable LaterRun module.
- - - - -
2 changed files:
- browser/components/BrowserContentHandler.sys.mjs
- browser/modules/LaterRun.sys.mjs
Changes:
=====================================
browser/components/BrowserContentHandler.sys.mjs
=====================================
@@ -774,8 +774,8 @@ nsBrowserContentHandler.prototype = {
additionalPage = Services.urlFormatter.formatURLPref(
"startup.homepage_welcome_url.additional"
);
- // Disable 'later run' pages for new profiles (tor-browser#41568)
- lazy.LaterRun.selfDestruct();
+ // Turn on 'later run' pages for new profiles.
+ lazy.LaterRun.enable(lazy.LaterRun.ENABLE_REASON_NEW_PROFILE);
break;
case OVERRIDE_NEW_MSTONE: {
// Check whether we will restore a session. If we will, we assume
=====================================
browser/modules/LaterRun.sys.mjs
=====================================
@@ -61,6 +61,20 @@ export let LaterRun = {
},
init(reason) {
+ // Keep disabled in Base Browser. See tor-browser#41568.
+ // NOTE: This means that users cannot benefit from feature prompts gated
+ // behind LaterRun.
+ // In mozilla ESR 128 it is only used in one place, and is gated behind a
+ // feature recommendation preference that we switch off in Base Browser
+ // anyway. See tor-browser#42630.
+ // But this decision should be reviewed. See tor-browser#43093.
+ Services.prefs.setBoolPref(kEnabledPref, false);
+ // Clear any preferences that may have been set before LaterRun was
+ // disabled.
+ Services.prefs.clearUserPref(kSessionCountPref);
+ Services.prefs.clearUserPref(kProfileCreationTime);
+ Services.prefs.clearUserPref(kUpdateAppliedTime);
+
if (!this.enabled) {
return;
}
@@ -99,11 +113,8 @@ export let LaterRun = {
return Services.prefs.getBoolPref(kEnabledPref, false);
},
- enable(reason) {
- if (!this.enabled) {
- Services.prefs.setBoolPref(kEnabledPref, true);
- this.init(reason);
- }
+ enable(_reason) {
+ // Keep disabled in Base Browser. See tor-browser#41568.
},
get hoursSinceInstall() {
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/df4211…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/df4211…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser
Commits:
df421101 by Pier Angelo Vendrame at 2024-08-29T10:15:34+02:00
fixup! Bug 23247: Communicating security expectations for .onion
Bug 42743: Check for .onion in the actual document URI in pageInfo.
One of our patches checks whether we are in a .onion domain when
showing the security information in pageInfo.xhtml.
However, it checks it in the requested URI rather than doing it on the
actually loaded URI, therefore about:neterror is shown as a secure
Onion service, which is not consistent with failures in loading
clearnet domains with HTTPS.
- - - - -
1 changed file:
- browser/base/content/pageinfo/security.js
Changes:
=====================================
browser/base/content/pageinfo/security.js
=====================================
@@ -53,16 +53,15 @@ var security = {
(Ci.nsIWebProgressListener.STATE_LOADED_MIXED_ACTIVE_CONTENT |
Ci.nsIWebProgressListener.STATE_LOADED_MIXED_DISPLAY_CONTENT);
var isEV = ui.state & Ci.nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL;
- var isOnion = false;
- let hostName;
- try {
- hostName = Services.eTLD.getBaseDomain(this.uri);
- } catch (e) {
- hostName = this.windowInfo.hostName;
- }
- if (hostName && hostName.endsWith(".onion")) {
- isOnion = true;
+ let uriInformation = new URL(gDocInfo.documentURIObject.spec);
+ // If the Onion site could not be loaded, the view-source will be also be
+ // about:neterror.
+ if (uriInformation.protocol == "view-source:") {
+ uriInformation = new URL(uriInformation.pathname);
}
+ const isOnion =
+ ["http:", "https:"].includes(uriInformation.protocol) &&
+ uriInformation.hostname.endsWith(".onion");
let retval = {
cAName: "",
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/df42110…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/df42110…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch mullvad-browser-115.15.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser
Commits:
37ef7afb by Pier Angelo Vendrame at 2024-08-28T21:58:03+00:00
MB 38: Mullvad Browser configuration
- - - - -
f8849e43 by Pier Angelo Vendrame at 2024-08-28T21:58:03+00:00
MB 1: Mullvad Browser branding
See also:
mullvad-browser#5: Product name and directory customization
mullvad-browser#12: Create new branding directories and integrate Mullvad icons+branding
mullvad-browser#14: Remove Default Built-in bookmarks
mullvad-browser#35: Add custom PDF icons for Windows builds
mullvad-browser#48: Replace Mozilla copyright and legal trademarks in mullvadbrowser.exe metadata
mullvad-browser#51: Update trademark string
mullvad-browser#104: Update shipped dll metadata copyright/licensing info
mullvad-browser#107: Add alpha and nightly icons
- - - - -
e86c3f1c by Pier Angelo Vendrame at 2024-08-28T21:58:04+00:00
MB 20: Allow packaged-addons in PBM.
We install a few addons from the distribution directory, but they are
not automatically enabled for PBM mode.
This commit modifies the code that installs them to also add the PBM
permission to the known ones.
- - - - -
6aa1d7de by Pier Angelo Vendrame at 2024-08-28T21:58:04+00:00
MB 63: Customize some about pages for Mullvad Browser
Also:
mullvad-browser#57: Purge unneeded about: pages
- - - - -
6daa7620 by Pier Angelo Vendrame at 2024-08-28T21:58:04+00:00
MB 37: Customization for the about dialog
- - - - -
c94bdf41 by Henry Wilkes at 2024-08-28T21:58:04+00:00
MB 39: Add home page about:mullvad-browser
- - - - -
f1ef654b by hackademix at 2024-08-28T21:58:05+00:00
MB 97: Remove UI cues to install new extensions.
- - - - -
4cee4b7a by hackademix at 2024-08-28T21:58:05+00:00
MB 47: uBlock Origin customization
- - - - -
688160a2 by Pier Angelo Vendrame at 2024-08-28T21:58:05+00:00
MB 21: Disable the password manager
This commit disables the about:login page and removes the "Login and
Password" section of about:preferences.
We do not do anything to the real password manager of Firefox, that is
in toolkit: it contains C++ parts that make it difficult to actually
prevent it from being built..
Finally, we modify the the function that opens about:login to report an
error in the console so that we can quickly get a backtrace to the code
that tries to use it.
- - - - -
82aafb40 by Pier Angelo Vendrame at 2024-08-28T21:58:05+00:00
MB 112: Updater customization for Mullvad Browser
MB 71: Set the updater base URL to Mullvad domain
- - - - -
265de51e by Nicolas Vigier at 2024-08-28T21:58:06+00:00
MB 79: Add Mullvad Browser MAR signing keys
MB 256: Add mullvad-browser nightly mar signing key
- - - - -
305b0424 by Pier Angelo Vendrame at 2024-08-28T21:58:06+00:00
MB 34: Hide unsafe and unwanted preferences UI
about:preferences allow to override some of our defaults, that could
be fingeprintable or have some other unwanted consequences.
- - - - -
121a0543 by Pier Angelo Vendrame at 2024-08-28T21:58:06+00:00
MB 160: Disable the cookie exceptions button
Besides disabling the "Delete on close checkbox", disable also the
"Manage Exceptions" button when always using PBM.
- - - - -
4a2169d9 by hackademix at 2024-08-28T21:58:06+00:00
MB 163: prevent uBlock Origin from being uninstalled/disabled
- - - - -
a234562b by Richard Pospesel at 2024-08-28T21:58:07+00:00
MB 188: Customize Gitlab Issue and Merge templates
- - - - -
2fcce7dc by rui hildt at 2024-08-28T21:58:07+00:00
MB 213: Customize the search engines list
- - - - -
8605e695 by hackademix at 2024-08-28T21:58:07+00:00
MB 214: Enable cross-tab identity leak protection in "quiet" mode
- - - - -
0de3a189 by Pier Angelo Vendrame at 2024-08-28T21:58:07+00:00
MB 234: Disable OS spoofing in HTTP User-Agent.
This commits makes it possible to disable OS spoofing in the HTTP
User-Agent header, to see if matching header and JS property improve
usability.
- - - - -
71a58d71 by Pier Angelo Vendrame at 2024-08-28T21:58:08+00:00
MB 80: Enable Mullvad Browser as a default browser
- - - - -
07d6ff62 by Dan Ballard at 2024-08-28T21:58:08+00:00
MB 290: Add default bookmarks in alpha channel for testing
- - - - -
7c46ec5a by june wilde at 2024-08-28T21:58:08+00:00
MB 305: Disable setting default browser on Windows
Until we can pull in upstream changes to fix breakage in setting
the Mullvad Browser as default in Windows 10/11 we're disabling
the ability to do so via about:preferences as well as via the
startup query dialog
- - - - -
30 changed files:
- .gitlab/issue_templates/Emergency Security Issue.md
- + .gitlab/issue_templates/Rebase Browser - Alpha.md
- + .gitlab/issue_templates/Rebase Browser - Stable.md
- .gitlab/merge_request_templates/default.md
- browser/app/Makefile.in
- browser/app/macbuild/Contents/Info.plist.in
- browser/app/module.ver
- browser/app/firefox.exe.manifest → browser/app/mullvadbrowser.exe.manifest
- + browser/app/profile/000-mullvad-browser.js
- browser/app/profile/001-base-profile.js
- browser/base/content/aboutDialog.xhtml
- browser/base/content/appmenu-viewcache.inc.xhtml
- browser/base/content/browser-menubar.inc
- browser/base/content/browser-places.js
- browser/base/content/browser.js
- browser/base/content/default-bookmarks.html
- browser/base/content/nsContextMenu.js
- browser/base/content/overrides/app-license.html
- browser/base/content/pageinfo/pageInfo.xhtml
- browser/base/content/utilityOverlay.js
- browser/branding/branding-common.mozbuild
- + browser/branding/mb-alpha/VisualElements_150.png
- + browser/branding/mb-alpha/VisualElements_70.png
- + browser/branding/mb-alpha/configure.sh
- + browser/branding/mb-alpha/content/about-logo.png
- + browser/branding/mb-alpha/content/about-logo.svg
- + browser/branding/mb-alpha/content/about-logo(a)2x.png
- + browser/branding/mb-alpha/content/about-wordmark.svg
- + browser/branding/mb-alpha/content/about.png
- + browser/branding/mb-alpha/content/aboutDialog.css
The diff was not included because it is too large.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/69…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/69…
You're receiving this email because of your account on gitlab.torproject.org.
morgan pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
5a9ee2bd by Pier Angelo Vendrame at 2024-08-27T18:34:40+02:00
Bug 41180: Avoid some copies for the expert bundles.
AndroidManifest.xml should be copied only in tor-expert-bundle when
doing Android builds.
The compiler is not needed in tor-expert-bundle-aar.
- - - - -
d994819d by Pier Angelo Vendrame at 2024-08-28T16:41:52+02:00
Bug 41224: Do not ship Conjure and GeoIP databases on some Android configurations.
- - - - -
3 changed files:
- projects/tor-expert-bundle-aar/config
- projects/tor-expert-bundle/build
- projects/tor-expert-bundle/config
Changes:
=====================================
projects/tor-expert-bundle-aar/config
=====================================
@@ -8,8 +8,6 @@ var:
input_files:
- project: container-image
- - name: '[% c("var/compiler") %]'
- project: '[% c("var/compiler") %]'
- project: tor-expert-bundle
name: tor-expert-bundle-armv7
target_replace:
@@ -25,4 +23,4 @@ input_files:
- project: tor-expert-bundle
name: tor-expert-bundle-x86_64
target_replace:
- '^torbrowser-(?!testbuild).*': 'torbrowser-android-x86_64'
\ No newline at end of file
+ '^torbrowser-(?!testbuild).*': 'torbrowser-android-x86_64'
=====================================
projects/tor-expert-bundle/build
=====================================
@@ -15,7 +15,9 @@ mkdir pluggable_transports && cd pluggable_transports
tar -xkf $rootdir/[% c('input_files_by_name/lyrebird') %]
tar -xkf $rootdir/[% c('input_files_by_name/snowflake') %]
-tar -xkf $rootdir/[% c('input_files_by_name/conjure') %]
+[% IF c('input_files_by_name/conjure') -%]
+ tar -xkf $rootdir/[% c('input_files_by_name/conjure') %]
+[% END -%]
# add per-platform pt extension
awk '{gsub(/\$\{pt_extension\}/, "[% c("var/pt_extension") %]"); print}' $rootdir/pt_config.json > pt_config.json
@@ -33,11 +35,15 @@ cd $distdir
mkdir -p aar/assets/common
cp -a tor/libTor.so aar/jni/$abi/
- cp -a tor/pluggable_transports/conjure-client aar/jni/$abi/libConjure.so
cp -a tor/pluggable_transports/lyrebird aar/jni/$abi/libObfs4proxy.so
cp -a tor/pluggable_transports/snowflake-client aar/jni/$abi/libSnowflake.so
+ [% IF c('input_files_by_name/conjure') -%]
+ cp -a tor/pluggable_transports/conjure-client aar/jni/$abi/libConjure.so
+ [% END -%]
- cp -a data/* aar/assets/common/
+ # tor-browser-build#41224, tor-browser#42607: Currently we do not use the
+ # GeoIP databases. So, we avoid copying them to save space on the final APK.
+ # cp -a data/* aar/assets/common/
cp -a tor/pluggable_transports/pt_config.json aar/assets/common/
@@ -57,4 +63,4 @@ cd $distdir
tar_src => tar_src,
tar_args => '-czvf' _ dest_dir _ '/' _ c('filename') _ '/tor-expert-bundle.tar.gz',
});
-%]
\ No newline at end of file
+%]
=====================================
projects/tor-expert-bundle/config
=====================================
@@ -20,5 +20,7 @@ input_files:
project: snowflake
- name: conjure
project: conjure
+ enable: '[% !c("var/android-x86") && !c("var/android-x86_64") %]'
- filename: pt_config.json
- filename: AndroidManifest.xml
+ enable: '[% c("var/android") %]'
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.