[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] 5 commits: dropme! Bug 13379: Sign our MAR files.

20 Jan 2023


      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/6ebcf4f...

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6ebcf4f...
You're receiving this email because of your account on gitlab.torproject.org.

    

Pier Angelo Vendrame (＠pierov)

tags

participants (1)