[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated (bdbc21560c1a -> fdc9a5d06299)
This is an automated email from the git hooks/post-receive script.
pierov pushed a change to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser.
from bdbc21560c1a fixup! Add TorStrings module for localization new 6658c0005acc fixup! Bug 30605: Honor privacy.spoof_english in Android new 09a42b2bbfb0 fixup! Bug 40925: Implemented the Security Level component new 515f44ce268a fixup! Bug 9173: Change the default Firefox profile directory to be relative. new 28020af1754e fixup! Bug 40925: Implemented the Security Level component new 7591a0780be4 fixup! Base Browser's .mozconfigs. new fdc9a5d06299 fixup! TB3: Tor Browser's official .mozconfigs.
The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Summary of changes: browser/components/securitylevel/moz.build | 12 ------- .../config/mozconfigs/base-browser-android | 29 ++++++++------- browser/config/mozconfigs/tor-browser-android | 13 +++++++ browser/installer/package-manifest.in | 2 +- .../mozilla/geckoview/GeckoRuntimeSettings.java | 42 ++++++++++++++++++++++ mobile/android/installer/package-manifest.in | 3 ++ moz.configure | 2 +- mozconfig-android-aarch64 | 4 +++ mozconfig-android-all-dev | 2 +- mozconfig-android-armv7 | 37 ++----------------- mozconfig-android-x86 | 4 +++ mozconfig-android-x86_64 | 4 +++ toolkit/components/moz.build | 1 + .../components/securitylevel/SecurityLevel.jsm | 0 .../securitylevel/SecurityLevel.manifest | 0 .../components/securitylevel/components.conf | 2 +- .../components/securitylevel/moz.build | 2 -- 17 files changed, 94 insertions(+), 65 deletions(-) copy mozconfig-android-armv7 => browser/config/mozconfigs/base-browser-android (50%) create mode 100644 browser/config/mozconfigs/tor-browser-android create mode 100644 mozconfig-android-aarch64 create mode 100644 mozconfig-android-x86 create mode 100644 mozconfig-android-x86_64 rename {browser => toolkit}/components/securitylevel/SecurityLevel.jsm (100%) rename {browser => toolkit}/components/securitylevel/SecurityLevel.manifest (100%) rename {browser => toolkit}/components/securitylevel/components.conf (77%) copy {browser => toolkit}/components/securitylevel/moz.build (83%)
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser.
commit 6658c0005accfb1a4bbe659a58b20f5be45ff7b8 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Fri Sep 30 11:38:26 2022 +0200
fixup! Bug 30605: Honor privacy.spoof_english in Android
Added the missing Java related variable --- .../org/mozilla/geckoview/GeckoRuntimeSettings.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java index 48d13963d0b6..032903007e3c 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java @@ -523,6 +523,7 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { /* package */ final Pref<Boolean> mHttpsOnlyPrivateMode = new Pref<Boolean>("dom.security.https_only_mode_pbm", false); /* package */ final Pref<Integer> mProcessCount = new Pref<>("dom.ipc.processCount", 2); + /* package */ final Pref<Integer> mSpoofEnglish = new Pref<>("privacy.spoof_english", 0);
/* package */ int mPreferredColorScheme = COLOR_SCHEME_SYSTEM;
@@ -1267,6 +1268,26 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { return this; }
+ /** + * Get whether we should spoof locale to English for webpages. + * + * @return Whether we should spoof locale to English for webpages. + */ + public boolean getSpoofEnglish() { + return mSpoofEnglish.get() == 2; + } + + /** + * Set whether we should spoof locale to English for webpages. + * + * @param flag A flag determining whether we should locale to English for webpages. + * @return This GeckoRuntimeSettings instance. + */ + public @NonNull GeckoRuntimeSettings setSpoofEnglish(final boolean flag) { + mSpoofEnglish.commit(flag ? 2 : 1); + return this; + } + @Override // Parcelable public void writeToParcel(final Parcel out, final int flags) { super.writeToParcel(out, flags);
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser.
commit 09a42b2bbfb0395e733dc339d83047e11874c532 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Fri Sep 30 11:39:06 2022 +0200
fixup! Bug 40925: Implemented the Security Level component
Fixed the missing Java variable on the Android part --- .../org/mozilla/geckoview/GeckoRuntimeSettings.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java index 032903007e3c..cae56085cd03 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java @@ -524,6 +524,7 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { new Pref<Boolean>("dom.security.https_only_mode_pbm", false); /* package */ final Pref<Integer> mProcessCount = new Pref<>("dom.ipc.processCount", 2); /* package */ final Pref<Integer> mSpoofEnglish = new Pref<>("privacy.spoof_english", 0); + /* package */ final Pref<Integer> mTorSecurityLevel = new Pref<>("extensions.torbutton.security_slider", 4);
/* package */ int mPreferredColorScheme = COLOR_SCHEME_SYSTEM;
@@ -1288,6 +1289,26 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { return this; }
+ /** + * Gets the current security level. + * + * @return current security protection level + */ + public int getTorSecurityLevel() { + return mTorSecurityLevel.get(); + } + + /** + * Sets the Tor Security Level. + * + * @param level security protection level + * @return This GeckoRuntimeSettings instance. + */ + public @NonNull GeckoRuntimeSettings setTorSecurityLevel(final int level) { + mTorSecurityLevel.commit(level); + return this; + } + @Override // Parcelable public void writeToParcel(final Parcel out, final int flags) { super.writeToParcel(out, flags);
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser.
commit 515f44ce268a2b15c8b6fd44bc64df8a8c849086 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Fri Sep 30 11:42:38 2022 +0200
fixup! Bug 9173: Change the default Firefox profile directory to be relative.
The relative_profile function is called also when --with-relative-profile is not defined, and this made the Android build fail. We have to check if the value was actually supplied. --- moz.configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/moz.configure b/moz.configure index be5b761805ae..d7073eba80b7 100755 --- a/moz.configure +++ b/moz.configure @@ -1035,7 +1035,7 @@ option( @depends("--with-relative-profile", target) @imports("json") def relative_profile(value, target): - if target.os == "Android": + if value and target.os == "Android": die("--with-relative-profile is not supported on Android") if value: return json.dumps(value[0])
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser.
commit 28020af1754e41f3d63bd0cd84d1117fab55a1d5 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Mon Oct 3 12:35:48 2022 +0200
fixup! Bug 40925: Implemented the Security Level component
Bug 41308: Moved the Security Level backend to include it also on Android --- browser/components/securitylevel/moz.build | 12 ------------ browser/installer/package-manifest.in | 2 +- mobile/android/installer/package-manifest.in | 3 +++ toolkit/components/moz.build | 1 + .../components/securitylevel/SecurityLevel.jsm | 0 .../components/securitylevel/SecurityLevel.manifest | 0 .../components/securitylevel/components.conf | 2 +- {browser => toolkit}/components/securitylevel/moz.build | 2 -- 8 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/browser/components/securitylevel/moz.build b/browser/components/securitylevel/moz.build index 33573a3706f9..2661ad7cb9f3 100644 --- a/browser/components/securitylevel/moz.build +++ b/browser/components/securitylevel/moz.build @@ -1,13 +1 @@ JAR_MANIFESTS += ["jar.mn"] - -EXTRA_JS_MODULES += [ - "SecurityLevel.jsm", -] - -XPCOM_MANIFESTS += [ - "components.conf", -] - -EXTRA_COMPONENTS += [ - "SecurityLevel.manifest", -] diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 1cffb5564030..c84928e45c15 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -259,7 +259,7 @@ @RESPATH@/browser/chrome/newidentity/ @RESPATH@/browser/chrome/securitylevel.manifest @RESPATH@/browser/chrome/securitylevel/ -@RESPATH@/browser/components/SecurityLevel.manifest +@RESPATH@/components/SecurityLevel.manifest
; [DevTools Startup Files] @RESPATH@/browser/chrome/devtools-startup@JAREXT@ diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 29ffe95fa27c..ead4a138d927 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -134,6 +134,9 @@ @BINPATH@/chrome/devtools@JAREXT@ @BINPATH@/chrome/devtools.manifest
+; Base Browser +@BINPATH@/components/SecurityLevel.manifest + ; Torbutton @BINPATH@/chrome/torbutton@JAREXT@ @BINPATH@/chrome/torbutton.manifest diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build index 4e88cf68d22c..86a289d2c71d 100644 --- a/toolkit/components/moz.build +++ b/toolkit/components/moz.build @@ -66,6 +66,7 @@ DIRS += [ "reputationservice", "resistfingerprinting", "search", + "securitylevel", "sessionstore", "shell", "startup", diff --git a/browser/components/securitylevel/SecurityLevel.jsm b/toolkit/components/securitylevel/SecurityLevel.jsm similarity index 100% rename from browser/components/securitylevel/SecurityLevel.jsm rename to toolkit/components/securitylevel/SecurityLevel.jsm diff --git a/browser/components/securitylevel/SecurityLevel.manifest b/toolkit/components/securitylevel/SecurityLevel.manifest similarity index 100% rename from browser/components/securitylevel/SecurityLevel.manifest rename to toolkit/components/securitylevel/SecurityLevel.manifest diff --git a/browser/components/securitylevel/components.conf b/toolkit/components/securitylevel/components.conf similarity index 77% rename from browser/components/securitylevel/components.conf rename to toolkit/components/securitylevel/components.conf index 4b9263ce7f0f..d25c9f994071 100644 --- a/browser/components/securitylevel/components.conf +++ b/toolkit/components/securitylevel/components.conf @@ -4,7 +4,7 @@ Classes = [ "contract_ids": [ "@torproject.org/security-level;1", ], - "jsm": "resource:///modules/SecurityLevel.jsm", + "jsm": "resource://gre/modules/SecurityLevel.jsm", "constructor": "SecurityLevel", } ] diff --git a/browser/components/securitylevel/moz.build b/toolkit/components/securitylevel/moz.build similarity index 83% copy from browser/components/securitylevel/moz.build copy to toolkit/components/securitylevel/moz.build index 33573a3706f9..576ee1e1f536 100644 --- a/browser/components/securitylevel/moz.build +++ b/toolkit/components/securitylevel/moz.build @@ -1,5 +1,3 @@ -JAR_MANIFESTS += ["jar.mn"] - EXTRA_JS_MODULES += [ "SecurityLevel.jsm", ]
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser.
commit 7591a0780be46f561a05a86d4fb36b909497b9a7 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Mon Oct 3 12:56:46 2022 +0200
fixup! Base Browser's .mozconfigs.
Added Android mozconfigs. --- .../config/mozconfigs/base-browser-android | 29 ++++++++++------- mozconfig-android-aarch64 | 4 +++ mozconfig-android-all-dev | 2 +- mozconfig-android-armv7 | 37 ++-------------------- mozconfig-android-x86 | 4 +++ mozconfig-android-x86_64 | 4 +++ 6 files changed, 32 insertions(+), 48 deletions(-)
diff --git a/mozconfig-android-armv7 b/browser/config/mozconfigs/base-browser-android similarity index 50% copy from mozconfig-android-armv7 copy to browser/config/mozconfigs/base-browser-android index 6ea51b0d5c05..5f882178828c 100644 --- a/mozconfig-android-armv7 +++ b/browser/config/mozconfigs/base-browser-android @@ -1,26 +1,23 @@ -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" export MOZILLA_OFFICIAL=1
ac_add_options --enable-optimize ac_add_options --enable-rust-simd ac_add_options --enable-official-branding
-# Android ac_add_options --enable-application=mobile/android -ac_add_options --target=arm-linux-androideabi -ac_add_options --with-android-ndk="$NDK_BASE" #Enter the android ndk location(ndk r17b) -ac_add_options --with-android-sdk="$SDK_BASE" #Enter the android sdk location -ac_add_options --with-branding=mobile/android/branding/alpha
-# Use Mozilla's Clang blobs -CC="$HOME/.mozbuild/clang/bin/clang" -CXX="$HOME/.mozbuild/clang/bin/clang++" +CC="clang" +CXX="clang++" +ac_add_options --with-java-bin-path=$JAVA_HOME/bin +ac_add_options --with-android-sdk=$ANDROID_HOME +ac_add_options --with-android-ndk=$ANDROID_NDK_HOME +ac_add_options --with-android-min-sdk=21
-#enable ccache to set amount of cache assigned for build. -ac_add_options --with-ccache +# https://bugzilla.mozilla.org/show_bug.cgi?id=1758568 +ac_add_options --enable-minify=properties
ac_add_options --enable-strip +ac_add_options --enable-install-strip ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --disable-rust-debug @@ -33,5 +30,13 @@ ac_add_options --disable-parental-controls ac_add_options --enable-proxy-bypass-protection ac_add_options --disable-system-policies
+ac_add_options --enable-base-browser + # Disable telemetry ac_add_options MOZ_TELEMETRY_REPORTING= + +if test ! -z "$LOCAL_DEV_BUILD"; then + ac_add_options --without-wasm-sandboxed-libraries + # You must use the "default" bogus channel for dev builds + ac_add_options --enable-update-channel=default +fi diff --git a/mozconfig-android-aarch64 b/mozconfig-android-aarch64 new file mode 100644 index 000000000000..5e166ec9ea8c --- /dev/null +++ b/mozconfig-android-aarch64 @@ -0,0 +1,4 @@ +. $topsrcdir/browser/config/mozconfigs/base-browser-android + +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-aarch64-linux-android +ac_add_options --target=aarch64-linux-android diff --git a/mozconfig-android-all-dev b/mozconfig-android-all-dev index 1d3d612eca97..8e2b5a05b5bf 100644 --- a/mozconfig-android-all-dev +++ b/mozconfig-android-all-dev @@ -13,4 +13,4 @@ ac_add_options --without-wasm-sandboxed-libraries ac_add_options --with-tor-browser-version=dev-build
ac_add_options --with-java-bin-path=/usr/lib/jvm/java-11-openjdk-amd64/bin -ac_add_options --with-android-sdk=$HOME/Android/Sdk +ac_add_options --with-android-sdk=$ANDROID_HOME diff --git a/mozconfig-android-armv7 b/mozconfig-android-armv7 index 6ea51b0d5c05..05468e50be53 100644 --- a/mozconfig-android-armv7 +++ b/mozconfig-android-armv7 @@ -1,37 +1,4 @@ -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 - -ac_add_options --enable-optimize -ac_add_options --enable-rust-simd -ac_add_options --enable-official-branding +. $topsrcdir/browser/config/mozconfigs/base-browser-android
-# Android -ac_add_options --enable-application=mobile/android +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi ac_add_options --target=arm-linux-androideabi -ac_add_options --with-android-ndk="$NDK_BASE" #Enter the android ndk location(ndk r17b) -ac_add_options --with-android-sdk="$SDK_BASE" #Enter the android sdk location -ac_add_options --with-branding=mobile/android/branding/alpha - -# Use Mozilla's Clang blobs -CC="$HOME/.mozbuild/clang/bin/clang" -CXX="$HOME/.mozbuild/clang/bin/clang++" - -#enable ccache to set amount of cache assigned for build. -ac_add_options --with-ccache - -ac_add_options --enable-strip -ac_add_options --disable-tests -ac_add_options --disable-debug -ac_add_options --disable-rust-debug - -ac_add_options --disable-updater -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls - -ac_add_options --enable-proxy-bypass-protection -ac_add_options --disable-system-policies - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/mozconfig-android-x86 b/mozconfig-android-x86 new file mode 100644 index 000000000000..ed1c88cf396e --- /dev/null +++ b/mozconfig-android-x86 @@ -0,0 +1,4 @@ +. $topsrcdir/browser/config/mozconfigs/base-browser-android + +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-i386-linux-android +ac_add_options --target=i686-linux-android diff --git a/mozconfig-android-x86_64 b/mozconfig-android-x86_64 new file mode 100644 index 000000000000..f8f6a301d4fb --- /dev/null +++ b/mozconfig-android-x86_64 @@ -0,0 +1,4 @@ +. $topsrcdir/browser/config/mozconfigs/base-browser-android + +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-x86_64-linux-android +ac_add_options --target=x86_64-linux-android
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser.
commit fdc9a5d0629930aaa08dabaafde7ea2a8baecbc7 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Mon Oct 3 12:58:53 2022 +0200
fixup! TB3: Tor Browser's official .mozconfigs.
Added Android mozconfigs --- browser/config/mozconfigs/tor-browser-android | 13 +++++++++++++ mozconfig-android-aarch64 | 2 +- mozconfig-android-armv7 | 2 +- mozconfig-android-x86 | 2 +- mozconfig-android-x86_64 | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/browser/config/mozconfigs/tor-browser-android b/browser/config/mozconfigs/tor-browser-android new file mode 100644 index 000000000000..1aef19a587a3 --- /dev/null +++ b/browser/config/mozconfigs/tor-browser-android @@ -0,0 +1,13 @@ +. $topsrcdir/browser/config/mozconfigs/base-browser-android + +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" + +# We do not use Tor Launcher on Android: +ac_add_options --disable-tor-launcher + +ac_add_options --disable-tor-browser-update +ac_add_options --disable-verify-mar + +if test ! -z "$LOCAL_DEV_BUILD"; then + ac_add_options --with-tor-browser-version=dev-build +fi diff --git a/mozconfig-android-aarch64 b/mozconfig-android-aarch64 index 5e166ec9ea8c..cd03397c1301 100644 --- a/mozconfig-android-aarch64 +++ b/mozconfig-android-aarch64 @@ -1,4 +1,4 @@ -. $topsrcdir/browser/config/mozconfigs/base-browser-android +. $topsrcdir/browser/config/mozconfigs/tor-browser-android
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-aarch64-linux-android ac_add_options --target=aarch64-linux-android diff --git a/mozconfig-android-armv7 b/mozconfig-android-armv7 index 05468e50be53..fb005a976d12 100644 --- a/mozconfig-android-armv7 +++ b/mozconfig-android-armv7 @@ -1,4 +1,4 @@ -. $topsrcdir/browser/config/mozconfigs/base-browser-android +. $topsrcdir/browser/config/mozconfigs/tor-browser-android
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi ac_add_options --target=arm-linux-androideabi diff --git a/mozconfig-android-x86 b/mozconfig-android-x86 index ed1c88cf396e..9e42962ca222 100644 --- a/mozconfig-android-x86 +++ b/mozconfig-android-x86 @@ -1,4 +1,4 @@ -. $topsrcdir/browser/config/mozconfigs/base-browser-android +. $topsrcdir/browser/config/mozconfigs/tor-browser-android
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-i386-linux-android ac_add_options --target=i686-linux-android diff --git a/mozconfig-android-x86_64 b/mozconfig-android-x86_64 index f8f6a301d4fb..7ceece15fcb2 100644 --- a/mozconfig-android-x86_64 +++ b/mozconfig-android-x86_64 @@ -1,4 +1,4 @@ -. $topsrcdir/browser/config/mozconfigs/base-browser-android +. $topsrcdir/browser/config/mozconfigs/tor-browser-android
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-x86_64-linux-android ac_add_options --target=x86_64-linux-android
tor-commits@lists.torproject.org
-
gitolite role