boklm pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
bed1acda by Pier Angelo Vendrame at 2023-09-08T10:01:18+02:00
Bug 40951: Copy tor-browser.ftl to the right directory on macOS.
While we store our Japanese translation in ja, on macOS we need to move
the file to the ja-JP-mac directory.
- - - - -
1 changed file:
- projects/firefox/build
Changes:
=====================================
projects/firefox/build
=====================================
@@ -134,7 +134,7 @@ mkdir "$HOME/.mozbuild"
lang="ja"
fi
[% END -%]
- mv "$transl_tor_browser/$lang/tor-browser.ftl" "$l10ncentral/$lang/browser/browser/"
+ mv "$transl_tor_browser/$lang/tor-browser.ftl" "$l10ncentral/$central_lang/browser/browser/"
mv "$transl_tor_browser/$lang/cryptoSafetyPrompt.properties" "$l10ncentral/$central_lang/browser/chrome/browser/"
mv "$transl_tor_browser/$lang" "$torbutton_locales/"
echo "% locale torbutton $lang %locale/$lang/" >> "$torbutton_jar"
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b…
You're receiving this email because of your account on gitlab.torproject.org.
richard pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
0f702b2f by Pier Angelo Vendrame at 2023-09-06T21:21:18+02:00
Bug 40149: Remove patching of nightly update URL
Use a new configuration option we recently introduced.
Fixes also #40946, as we use the same option for testing purposes.
- - - - -
3 changed files:
- projects/firefox/build
- projects/firefox/config
- projects/firefox/mozconfig
Changes:
=====================================
projects/firefox/build
=====================================
@@ -91,11 +91,7 @@ MOZCONFIG_EOF
[% END -%]
[% IF c("var/override_updater_url") -%]
- sed -i 's|^URL=https://aus1\.torproject\.org/.*|URL=[% c("var/override_updater_url") %]|' build/application.ini.in
cp $rootdir/marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der
-[% ELSIF c("var/nightly") && ! c("var/mullvad-browser") -%]
- # Set update url for nightly (#33402 / #40033)
- sed -i 's|^URL=https://aus1\.torproject\.org/.*|URL=https://nightlies.tbb.torprojec… c("var/nightly_updates_publish_dir") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in
[% END -%]
export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
=====================================
projects/firefox/config
=====================================
@@ -30,12 +30,15 @@ var:
- yasm
- pkg-config
has_l10n: '[% !c("var/testbuild") && c("var/locales").size %]'
+ # For testing purposes use override_updater_url, as it will also override the
+ # certificate.
+ updater_url: 'https://aus1.torproject.org/torbrowser/update_3/'
# Uncomment this if you want to test the updater. You will need to provide a
# marsigner.der in this directory, too. It will be used as a replacement for
# the nightly builds keys only. So, using this option for alphas and releases
# will not work (the browser will fail with a key/signature mismatch).
- # override_updater_url: 'https://tb-build-05.torproject.org/~you/update_3/%CHANNEL%/%BUILD_TARGET%/%…'
+ # override_updater_url: 'https://tb-build-05.torproject.org/~you/update_3/'
rezip: |
rezip_tmpdir=$(mktemp -d)
@@ -78,12 +81,15 @@ targets:
nightly:
git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]'
tag_gpg_id: 0
+ var:
+ updater_url: 'https://nightlies.tbb.torproject.org/nightly-updates/updates/[% c("var/nightly_updates_publish_dir") %]'
mullvadbrowser:
git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git
var:
branding_directory_prefix: 'mb'
gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser
+ updater_url: 'https://cdn.mullvad.net/browser/update_responses/update_1/'
linux-x86_64:
var:
=====================================
projects/firefox/mozconfig
=====================================
@@ -71,6 +71,11 @@
ac_add_options --[% IF c("var/updater_enabled") %]enable[% ELSE %]disable[% END %]-updater
ac_add_options --[% IF c("var/updater_enabled") %]enable[% ELSE %]disable[% END %]-base-browser-update
+[% IF c("var/override_updater_url") -%]
+ ac_add_options --with-updater-url=[% c("var/override_updater_url") %]
+[% ELSIF c("var/updater_url") -%]
+ ac_add_options --with-updater-url=[% c("var/updater_url") %]
+[% END -%]
mk_add_options MOZ_PARALLEL_BUILD=[% c("num_procs") %]
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0…
You're receiving this email because of your account on gitlab.torproject.org.
richard pushed to branch base-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
bba964da by Pier Angelo Vendrame at 2023-09-07T22:19:02+00:00
fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
Allow customizing the updater URL with config options.
With this, we will not need sed hacks on tor-browser-build anymore.
- - - - -
3 changed files:
- build/application.ini.in
- build/moz.build
- build/moz.configure/update-programs.configure
Changes:
=====================================
build/application.ini.in
=====================================
@@ -52,5 +52,5 @@ ServerURL=@MOZ_CRASHREPORTER_URL@/submit?id=@MOZ_APP_ID@&version=@MOZ_APP_VERSIO
#if MOZ_UPDATER
[AppUpdate]
-URL=https://aus1.torproject.org/basebrowser/update_3/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL
+URL=@BB_UPDATER_URL@/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL
#endif
=====================================
build/moz.build
=====================================
@@ -75,6 +75,7 @@ if CONFIG["MOZ_APP_BASENAME"]:
"MAR_CHANNEL_ID",
"MOZ_APP_REMOTINGNAME",
"MOZ_CRASHREPORTER_URL",
+ "BB_UPDATER_URL",
):
appini_defines[var] = CONFIG[var]
=====================================
build/moz.configure/update-programs.configure
=====================================
@@ -204,3 +204,19 @@ option(
set_config("BASE_BROWSER_UPDATE", True, when="--enable-base-browser-update")
set_define("BASE_BROWSER_UPDATE", True, when="--enable-base-browser-update")
+
+
+# Updater URL
+# ==============================================================
+
+option(
+ "--with-updater-url",
+ default="https://aus1.torproject.org/torbrowser/update_3/",
+ nargs=1,
+ help="Set the updater URL",
+)
+
+set_config(
+ "BB_UPDATER_URL",
+ depends("--with-updater-url")(lambda x: x[0].rstrip("/")),
+)
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/bba964d…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/bba964d…
You're receiving this email because of your account on gitlab.torproject.org.
richard pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
9b73a337 by Pier Angelo Vendrame at 2023-09-06T22:20:01+00:00
fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
Allow customizing the updater URL with config options.
With this, we will not need sed hacks on tor-browser-build anymore.
- - - - -
3 changed files:
- build/application.ini.in
- build/moz.build
- build/moz.configure/update-programs.configure
Changes:
=====================================
build/application.ini.in
=====================================
@@ -52,5 +52,5 @@ ServerURL=@MOZ_CRASHREPORTER_URL@/submit?id=@MOZ_APP_ID@&version=@MOZ_APP_VERSIO
#if MOZ_UPDATER
[AppUpdate]
-URL=https://aus1.torproject.org/torbrowser/update_3/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL
+URL=@BB_UPDATER_URL@/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL
#endif
=====================================
build/moz.build
=====================================
@@ -75,6 +75,7 @@ if CONFIG["MOZ_APP_BASENAME"]:
"MAR_CHANNEL_ID",
"MOZ_APP_REMOTINGNAME",
"MOZ_CRASHREPORTER_URL",
+ "BB_UPDATER_URL",
):
appini_defines[var] = CONFIG[var]
=====================================
build/moz.configure/update-programs.configure
=====================================
@@ -204,3 +204,19 @@ option(
set_config("BASE_BROWSER_UPDATE", True, when="--enable-base-browser-update")
set_define("BASE_BROWSER_UPDATE", True, when="--enable-base-browser-update")
+
+
+# Updater URL
+# ==============================================================
+
+option(
+ "--with-updater-url",
+ default="https://aus1.torproject.org/torbrowser/update_3/",
+ nargs=1,
+ help="Set the updater URL",
+)
+
+set_config(
+ "BB_UPDATER_URL",
+ depends("--with-updater-url")(lambda x: x[0].rstrip("/")),
+)
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9b73a33…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9b73a33…
You're receiving this email because of your account on gitlab.torproject.org.
richard pushed to branch base-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
bb9daa6d by Richard Pospesel at 2023-09-06T20:50:30+00:00
fixup! Firefox preference overrides.
Bug 42057: Disable GetIsTextRecognitionSupported by default
- - - - -
1 changed file:
- browser/app/profile/001-base-profile.js
Changes:
=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -539,6 +539,9 @@ pref("privacy.query_stripping.enabled", true);
pref("privacy.query_stripping.enabled.pbmode", true);
pref("privacy.query_stripping.strip_on_share.enabled", true);
+// Disable platform text recogniition functionality (tor-browser#42057)
+pref("dom.text-recognition.enabled", false);
+
#ifdef XP_WIN
// prefs to disable jump-list entries in the taskbar on Windows (see bug #12885)
// this pref changes the app's set AUMID to be dependent on the profile path, rather than
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/bb9daa6…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/bb9daa6…
You're receiving this email because of your account on gitlab.torproject.org.
richard pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
f60ab8ba by Richard Pospesel at 2023-09-05T21:04:40+00:00
fixup! Firefox preference overrides.
Bug 42057: Disable GetIsTextRecognitionSupported by default
- - - - -
1 changed file:
- browser/app/profile/001-base-profile.js
Changes:
=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -539,6 +539,9 @@ pref("privacy.query_stripping.enabled", true);
pref("privacy.query_stripping.enabled.pbmode", true);
pref("privacy.query_stripping.strip_on_share.enabled", true);
+// Disable platform text recogniition functionality (tor-browser#42057)
+pref("dom.text-recognition.enabled", false);
+
#ifdef XP_WIN
// prefs to disable jump-list entries in the taskbar on Windows (see bug #12885)
// this pref changes the app's set AUMID to be dependent on the profile path, rather than
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f60ab8b…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f60ab8b…
You're receiving this email because of your account on gitlab.torproject.org.
richard pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
486e1ea1 by Nicolas Vigier at 2023-09-06T18:38:34+00:00
Bug 40944: Avoid parsing .incremental.mar files as non-incremental mars
- - - - -
20b24282 by Nicolas Vigier at 2023-09-06T18:38:34+00:00
Bug 40944: In update_responses, make an error if we see an unkwown OS
If a mar file is found with an OS name that doesn't have a corresponding
`build_targets` entry in the config, the OS name was being used as build
target to generate the `.htaccess` file. This is not supposed to happen,
except when something is wrong, so instead we should make an error in
that case.
- - - - -
f6da50f9 by Nicolas Vigier at 2023-09-06T18:38:34+00:00
Bug 40947: Remove migrate_langs from tools/signing/nightly/update-responses-base-config.yml
- - - - -
2 changed files:
- tools/signing/nightly/update-responses-base-config.yml
- tools/update-responses/update_responses
Changes:
=====================================
tools/signing/nightly/update-responses-base-config.yml
=====================================
@@ -18,8 +18,6 @@ versions:
nightly_version:
platformVersion: 115.1.0
detailsURL: http://umj4zbqdfcyevlkgqgpq6foxk3z75zzxsbgt5jqmfxofrbrjh3crbnad.onion/
- migrate_langs:
- pt-PT: pt-BR
macos:
minSupportedOSVersion: 16.0.0
windows-i686:
=====================================
tools/update-responses/update_responses
=====================================
@@ -50,7 +50,7 @@ sub get_tmpdir {
}
sub build_targets_by_os {
- return ($_[0]) unless $config->{build_targets}{$_[0]};
+ exit_error "Unknown build target for OS $_[0]" unless $config->{build_targets}{$_[0]};
my $r = $config->{build_targets}{$_[0]};
return ref $r eq 'ARRAY' ? @$r : ($r);
}
@@ -98,7 +98,8 @@ sub get_version_files {
opendir(my $d, $vdir) or exit_error "Error opening directory $vdir";
foreach my $file (readdir $d) {
next unless -f "$vdir/$file";
- if ($file =~ m/^$appname-(.+)-${version}_(.+)\.mar$/) {
+ if ($file !~ m/incremental\.mar$/ &&
+ $file =~ m/^$appname-(.+)-${version}_(.+)\.mar$/) {
my ($os, $lang) = ($1, $2);
$files->{$os}{$lang}{complete} = {
type => 'complete',
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.
richard pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
639e1671 by Nicolas Vigier at 2023-09-06T18:30:37+00:00
Bug 40948: Don't check lyrebird-vendor sha256sum in nightly
Also update rbm for rbm#40059.
- - - - -
2 changed files:
- projects/lyrebird/config
- rbm
Changes:
=====================================
projects/lyrebird/config
=====================================
@@ -17,7 +17,7 @@ targets:
version: '[% c("abbrev") %]'
tag_gpg_id: 0
var:
- go_vendor_sha256sum: 028c4536c10266331d680c0618b859d8f4ea8d630cd8588f13cfcc5b2d4272a1
+ go_vendor_sha256sum: ''
steps:
build:
=====================================
rbm
=====================================
@@ -1 +1 @@
-Subproject commit 6a20418284d94edad88986eaa4f01fc4e4476854
+Subproject commit c4c1716dcbffa58c102daa8a5f3e188acdaf823a
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6…
You're receiving this email because of your account on gitlab.torproject.org.