boklm pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
7f1fcca6 by Nicolas Vigier at 2023-01-23T17:46:39+01:00
Bug 40747: Remove empty line at the top of sha256sums-unsigned-build.txt
- - - - -
80d457f7 by Nicolas Vigier at 2023-01-23T17:46:42+01:00
Bug 40748: Remove warning in dmg2mar when sha256sums-unsigned-build.txt contains an empty line
- - - - -
2 changed files:
- projects/release/build
- tools/dmg2mar
Changes:
=====================================
projects/release/build
=====================================
@@ -51,7 +51,7 @@ RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incremen
EOF
# empty any existing sh256sums file
-echo > sha256sums-unsigned-build.txt
+echo -n > sha256sums-unsigned-build.txt
# concat sha256sum entry for each file in set
for i in $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz *.apk *.json | grep -v '\.incremental\.mar$' | sort)
do
=====================================
tools/dmg2mar
=====================================
@@ -95,6 +95,7 @@ sub get_dmg_files_from_sha256sums {
my @files;
foreach my $line (read_file('sha256sums-unsigned-build.txt')) {
my (undef, $filename) = split ' ', $line;
+ next unless $filename;
chomp $filename;
next unless $filename =~ m/^$appname_dmg-(.+)-macos_(.+)\.dmg$/;
push @files, { filename => $filename, version => $1, lang => $2 };
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.
Pier Angelo Vendrame pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser
Commits:
a9f50c4e by Pier Angelo Vendrame at 2023-01-23T17:39:28+01:00
Bug 41542: Disable the creation of a default profile
Firefox creates a profile as a fallback for old versions.
However, we do not need this, so we want to prevent Firefox from
creating the related directories.
We comment out the code, but should Mozilla be interested in a
compile-time flag, we could rewrite the patch to add one.
See also https://bugzilla.mozilla.org/show_bug.cgi?id=1770174.
- - - - -
1 changed file:
- toolkit/profile/nsToolkitProfileService.cpp
Changes:
=====================================
toolkit/profile/nsToolkitProfileService.cpp
=====================================
@@ -1578,6 +1578,12 @@ nsresult nsToolkitProfileService::SelectStartupProfile(
rv = CreateDefaultProfile(getter_AddRefs(mCurrent));
if (NS_SUCCEEDED(rv)) {
+ // tor-browser#41542: We do not need to support legacy versions.
+ // For now, we just use an ifdef, but we could write a patch to disable
+ // this behavior through a build-time flag, should Mozilla be interested
+ // in taking it.
+ // See also https://bugzilla.mozilla.org/show_bug.cgi?id=1770174
+#ifndef BASE_BROWSER
// If there is only one profile and it isn't meant to be the profile that
// older versions of Firefox use then we must create a default profile
// for older versions of Firefox to avoid the existing profile being
@@ -1589,6 +1595,7 @@ nsresult nsToolkitProfileService::SelectStartupProfile(
getter_AddRefs(newProfile));
SetNormalDefault(newProfile);
}
+#endif
rv = Flush();
NS_ENSURE_SUCCESS(rv, rv);
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a9f50c4…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a9f50c4…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser
Commits:
65ab09ce by Pier Angelo Vendrame at 2023-01-20T18:26:28+01:00
Bug 41542: Disable the creation of a default profile
Firefox creates a profile as a fallback for old versions.
However, we do not need this, so we want to prevent Firefox from
creating the related directories.
We comment out the code, but should Mozilla be interested in a
compile-time flag, we could rewrite the patch to add one.
See also https://bugzilla.mozilla.org/show_bug.cgi?id=1770174.
- - - - -
1 changed file:
- toolkit/profile/nsToolkitProfileService.cpp
Changes:
=====================================
toolkit/profile/nsToolkitProfileService.cpp
=====================================
@@ -1587,6 +1587,12 @@ nsresult nsToolkitProfileService::SelectStartupProfile(
rv = CreateDefaultProfile(getter_AddRefs(mCurrent));
if (NS_SUCCEEDED(rv)) {
+ // tor-browser#41542: We do not need to support legacy versions.
+ // For now, we just use an ifdef, but we could write a patch to disable
+ // this behavior through a build-time flag, should Mozilla be interested
+ // in taking it.
+ // See also https://bugzilla.mozilla.org/show_bug.cgi?id=1770174
+#ifndef BASE_BROWSER
// If there is only one profile and it isn't meant to be the profile that
// older versions of Firefox use then we must create a default profile
// for older versions of Firefox to avoid the existing profile being
@@ -1598,6 +1604,7 @@ nsresult nsToolkitProfileService::SelectStartupProfile(
getter_AddRefs(newProfile));
SetNormalDefault(newProfile);
}
+#endif
rv = Flush();
NS_ENSURE_SUCCESS(rv, rv);
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/65ab09c…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/65ab09c…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser
Commits:
a85b5b96 by Pier Angelo Vendrame at 2023-01-20T16:44:33+01:00
dropme! Bug 13379: Sign our MAR files.
Part of 41584.
This commit makes sure we're not messing stuff when rebasing.
- - - - -
541d508c by Pier Angelo Vendrame at 2023-01-20T16:44:40+01:00
Revert "TB3: Tor Browser's official .mozconfigs."
Part of 41584.
This reverts commit b721a1e22730fd407aa10e5b3d519345856b18f5.
- - - - -
d967a1fd by Pier Angelo Vendrame at 2023-01-20T16:44:46+01:00
squash! Base Browser's .mozconfigs.
Bug 17858: Cannot create incremental MARs for hardened builds.
Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff
(which is part of mar-tools and is not distributed to end-users) with
ASan.
Bug 21849: Don't allow SSL key logging.
Bug 25741 - TBA: Disable features at compile-time
Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION
Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds
This fixes a problem where some preferences had the wrong default value.
Also see bug 27472 where we made a similar fix for Android.
Bug 29859: Disable HLS support for now
Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING
Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT
Bug 33734: Set MOZ_NORMANDY to False
Bug 33851: Omit Parental Controls.
Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files
Bug 41584: Move some configuration options to base-browser level
- - - - -
ec2caef7 by Mike Perry at 2023-01-20T16:44:46+01:00
TB3: Tor Browser's official .mozconfigs.
Also:
Add an --enable-tor-browser-data-outside-app-dir configure option
Add --with-tor-browser-version configure option
Bug 31457: disable per-installation profiles
The dedicated profiles (per-installation) feature does not interact
well with our bundled profiles on Linux and Windows, and it also causes
multiple profiles to be created on macOS under TorBrowser-Data.
Bug 31935: Disable profile downgrade protection.
Since Tor Browser does not support more than one profile, disable
the prompt and associated code that offers to create one when a
version downgrade situation is detected.
Add --enable-tor-browser-update build option
Bug 40793: moved Tor configuration options from old-configure.in to moz.configure
Bug 41584: Move some configuration options to base-browser level
- - - - -
03866122 by Pier Angelo Vendrame at 2023-01-20T17:29:13+01:00
fixup! Bug 13379: Sign our MAR files.
Part of 41584.
This reverts commit 541d508cf5ff118d6438ee9f264a4e1f93cb7a6b
- - - - -
6 changed files:
- browser/moz.configure
- mobile/android/torbrowser.configure → mobile/android/basebrowser.configure
- mobile/android/confvars.sh
- mobile/android/moz.configure
- security/moz.build
- security/nss/lib/ssl/Makefile
Changes:
=====================================
browser/moz.configure
=====================================
@@ -5,10 +5,12 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
imply_option("MOZ_PLACES", True)
+# tor-browser#32493
imply_option("MOZ_SERVICES_HEALTHREPORT", False)
imply_option("MOZ_SERVICES_SYNC", True)
imply_option("MOZ_DEDICATED_PROFILES", False)
imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", False)
+# tor-browser#33734
imply_option("MOZ_NORMANDY", False)
with only_when(target_is_linux & compile_environment):
=====================================
mobile/android/torbrowser.configure → mobile/android/basebrowser.configure
=====================================
@@ -4,7 +4,8 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# Set Tor Browser default config
+# Set Base Browser default config
+# See tor-browser#25741 and tor-browser#41584.
imply_option("MOZ_ANDROID_EXCLUDE_FONTS", False)
@@ -14,7 +15,7 @@ imply_option("MOZ_ANDROID_EXCLUDE_FONTS", False)
# imply_option("MOZ_CRASHREPORTER", False)
# Disable uploading information about the browser configuration and
-# performance to an external server
+# performance to an external server. See tor-browser#32493.
imply_option("MOZ_SERVICES_HEALTHREPORT", False)
# Disable creating telemetry and data reports that are uploaded to an
@@ -26,5 +27,7 @@ imply_option("MOZ_SERVICES_HEALTHREPORT", False)
# imply_option("MOZ_TELEMETRY_REPORTING", False)
# imply_option("MOZ_DATA_REPORTING", False)
+# tor-browser#24796: This controls some permissions in GeckoView's
+# AndroidManifest.xml
imply_option("MOZ_ANDROID_NETWORK_STATE", False)
imply_option("MOZ_ANDROID_LOCATION", False)
=====================================
mobile/android/confvars.sh
=====================================
@@ -16,8 +16,6 @@ MOZ_RAW=1
MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}
-### Tor Browser for Android ###
-
# Disable telemetry at compile-time
unset MOZ_TELEMETRY_REPORTING
=====================================
mobile/android/moz.configure
=====================================
@@ -10,6 +10,7 @@ project_flag(
default=True,
)
+# tor-browser#29859
project_flag(
"MOZ_ANDROID_HLS_SUPPORT",
help="Enable HLS (HTTP Live Streaming) support (currently using the ExoPlayer library)",
@@ -58,7 +59,7 @@ option(
set_config("MOZ_ANDROID_GECKOVIEW_LITE", True, when="--enable-geckoview-lite")
imply_option("MOZ_NORMANDY", False)
-# Comment this so we can imply |False| in torbrowser.configure
+# Comment this so we can imply |False| in basebrowser.configure
# The Build system doesn't allow multiple imply_option()
# calls with the same key.
# imply_option("MOZ_SERVICES_HEALTHREPORT", True)
@@ -80,7 +81,7 @@ def check_target(target):
)
-include("torbrowser.configure")
+include("basebrowser.configure")
include("../../toolkit/moz.configure")
include("../../build/moz.configure/android-sdk.configure")
=====================================
security/moz.build
=====================================
@@ -85,6 +85,7 @@ gyp_vars["nss_dist_obj_dir"] = "$PRODUCT_DIR/dist/bin"
gyp_vars["disable_tests"] = 1
gyp_vars["disable_dbm"] = 1
gyp_vars["disable_libpkix"] = 1
+# tor-browser#18885, tor-browser#21849
gyp_vars["enable_sslkeylogfile"] = 0
# pkg-config won't reliably find zlib on our builders, so just force it.
# System zlib is only used for modutil and signtool unless
=====================================
security/nss/lib/ssl/Makefile
=====================================
@@ -41,6 +41,7 @@ endif
# Enable key logging by default in debug builds, but not opt builds.
# Logging still needs to be enabled at runtime through env vars.
+# tor-browser#18885, tor-browser#21849
NSS_ALLOW_SSLKEYLOGFILE ?= 0
ifeq (1,$(NSS_ALLOW_SSLKEYLOGFILE))
DEFINES += -DNSS_ALLOW_SSLKEYLOGFILE=1
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6ebcf4…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6ebcf4…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser
Commits:
5ad37bff by Pier Angelo Vendrame at 2023-01-20T16:41:46+01:00
squash! Base Browser's .mozconfigs.
Bug 17858: Cannot create incremental MARs for hardened builds.
Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff
(which is part of mar-tools and is not distributed to end-users) with
ASan.
Bug 21849: Don't allow SSL key logging.
Bug 25741 - TBA: Disable features at compile-time
Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION
Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds
This fixes a problem where some preferences had the wrong default value.
Also see bug 27472 where we made a similar fix for Android.
Bug 29859: Disable HLS support for now
Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING
Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT
Bug 33734: Set MOZ_NORMANDY to False
Bug 33851: Omit Parental Controls.
Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files
Bug 41584: Move some configuration options to base-browser level
- - - - -
6 changed files:
- browser/moz.configure
- + mobile/android/basebrowser.configure
- mobile/android/confvars.sh
- mobile/android/moz.configure
- security/moz.build
- security/nss/lib/ssl/Makefile
Changes:
=====================================
browser/moz.configure
=====================================
@@ -5,11 +5,13 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
imply_option("MOZ_PLACES", True)
-imply_option("MOZ_SERVICES_HEALTHREPORT", True)
+# tor-browser#32493
+imply_option("MOZ_SERVICES_HEALTHREPORT", False)
imply_option("MOZ_SERVICES_SYNC", True)
imply_option("MOZ_DEDICATED_PROFILES", True)
imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", True)
-imply_option("MOZ_NORMANDY", True)
+# tor-browser#33734
+imply_option("MOZ_NORMANDY", False)
with only_when(target_is_linux & compile_environment):
option(env="MOZ_NO_PIE_COMPAT", help="Enable non-PIE wrapper")
=====================================
mobile/android/basebrowser.configure
=====================================
@@ -0,0 +1,33 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Set Base Browser default config
+# See tor-browser#25741 and tor-browser#41584.
+
+imply_option("MOZ_ANDROID_EXCLUDE_FONTS", False)
+
+# Disable uploading crash reports and dump files to an external server
+# This is still configured in old-configure. Uncomment when this moves
+# to the python config
+# imply_option("MOZ_CRASHREPORTER", False)
+
+# Disable uploading information about the browser configuration and
+# performance to an external server. See tor-browser#32493.
+imply_option("MOZ_SERVICES_HEALTHREPORT", False)
+
+# Disable creating telemetry and data reports that are uploaded to an
+# external server
+# These aren't actually configure options. These are disabled in
+# confvars.sh, but they look like configure options so we'll document
+# them here, as well.
+# XXX: no confvars.sh here
+# imply_option("MOZ_TELEMETRY_REPORTING", False)
+# imply_option("MOZ_DATA_REPORTING", False)
+
+# tor-browser#24796: This controls some permissions in GeckoView's
+# AndroidManifest.xml
+imply_option("MOZ_ANDROID_NETWORK_STATE", False)
+imply_option("MOZ_ANDROID_LOCATION", False)
=====================================
mobile/android/confvars.sh
=====================================
@@ -15,3 +15,9 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official
MOZ_RAW=1
MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}
+
+# Disable telemetry at compile-time
+unset MOZ_TELEMETRY_REPORTING
+
+# Disable data reporting at compile-time
+unset MOZ_DATA_REPORTING
=====================================
mobile/android/moz.configure
=====================================
@@ -10,10 +10,11 @@ project_flag(
default=True,
)
+# tor-browser#29859
project_flag(
"MOZ_ANDROID_HLS_SUPPORT",
help="Enable HLS (HTTP Live Streaming) support (currently using the ExoPlayer library)",
- default=True,
+ default=False,
)
option(
@@ -58,7 +59,10 @@ option(
set_config("MOZ_ANDROID_GECKOVIEW_LITE", True, when="--enable-geckoview-lite")
imply_option("MOZ_NORMANDY", False)
-imply_option("MOZ_SERVICES_HEALTHREPORT", True)
+# Comment this so we can imply |False| in basebrowser.configure
+# The Build system doesn't allow multiple imply_option()
+# calls with the same key.
+# imply_option("MOZ_SERVICES_HEALTHREPORT", True)
imply_option("MOZ_ANDROID_HISTORY", True)
imply_option("--enable-small-chunk-size", True)
@@ -77,6 +81,8 @@ def check_target(target):
)
+include("basebrowser.configure")
+
include("../../toolkit/moz.configure")
include("../../build/moz.configure/android-sdk.configure")
include("../../build/moz.configure/java.configure")
=====================================
security/moz.build
=====================================
@@ -85,7 +85,8 @@ gyp_vars["nss_dist_obj_dir"] = "$PRODUCT_DIR/dist/bin"
gyp_vars["disable_tests"] = 1
gyp_vars["disable_dbm"] = 1
gyp_vars["disable_libpkix"] = 1
-gyp_vars["enable_sslkeylogfile"] = 1
+# tor-browser#18885, tor-browser#21849
+gyp_vars["enable_sslkeylogfile"] = 0
# pkg-config won't reliably find zlib on our builders, so just force it.
# System zlib is only used for modutil and signtool unless
# SSL zlib is enabled, which we are disabling immediately below this.
=====================================
security/nss/lib/ssl/Makefile
=====================================
@@ -41,7 +41,8 @@ endif
# Enable key logging by default in debug builds, but not opt builds.
# Logging still needs to be enabled at runtime through env vars.
-NSS_ALLOW_SSLKEYLOGFILE ?= $(if $(BUILD_OPT),0,1)
+# tor-browser#18885, tor-browser#21849
+NSS_ALLOW_SSLKEYLOGFILE ?= 0
ifeq (1,$(NSS_ALLOW_SSLKEYLOGFILE))
DEFINES += -DNSS_ALLOW_SSLKEYLOGFILE=1
endif
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5ad37bf…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5ad37bf…
You're receiving this email because of your account on gitlab.torproject.org.