- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-68.1.0esr-9.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 29 Aug '19

29 Aug '19

commit 3b423362d6729d76b0c79274f52972346900c4fc Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Aug 28 18:52:09 2019 +0200 squash! TB4: Tor Browser's Firefox preference overrides. Bug 30845: Make sure default themes and other internal extensions are enabled --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index f9114b7a892e..fd0b691d1831 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -264,7 +264,7 @@ pref("extensions.checkCompatibility.4.*", false); pref("extensions.databaseSchema", 3); pref("extensions.enabledAddons", "https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5"); pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); -pref("extensions.enabledScopes", 1); +pref("extensions.enabledScopes", 5); // AddonManager.SCOPE_PROFILE=1 | AddonManager.SCOPE_APPLICATION=4 pref("extensions.pendingOperations", false); pref("xpinstall.whitelist.add", ""); pref("xpinstall.whitelist.add.36", "");

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-1] Bug 1561322 - Allow spoofing strings in HTML forms r=baku, Pike
by gk＠torproject.org 29 Aug '19

29 Aug '19

commit 1ad6ff94d72b99a72ac66459230755502acccd8d Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Jul 24 13:22:22 2019 +0000 Bug 1561322 - Allow spoofing strings in HTML forms r=baku,Pike When privacy.spoof_english = 2, we should hide the user's locale in content. So we use en-US default strings for HTML form elements, such as a Submit button. We also force GetLocalizedEllipsis() to always return the ellipsis used by en-US. Differential Revision: https://phabricator.services.mozilla.com/D35815 --HG-- extra : moz-landing-system : lando --- browser/installer/package-manifest.in | 1 + dom/base/nsContentUtils.cpp | 35 ++++++++++++++++++++------ dom/base/nsContentUtils.h | 2 ++ dom/html/HTMLInputElement.cpp | 37 +++++++++++++++------------- dom/locales/moz.build | 4 +++ layout/base/nsCSSFrameConstructor.cpp | 8 +++--- layout/forms/nsFileControlFrame.cpp | 4 +-- layout/forms/nsGfxButtonControlFrame.cpp | 4 +-- layout/generic/DetailsFrame.cpp | 5 ++-- mobile/android/installer/package-manifest.in | 1 + 10 files changed, 67 insertions(+), 34 deletions(-) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index a160f316a56d..1a2a24f9b5b9 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -344,6 +344,7 @@ @RESPATH@/res/fonts/* @RESPATH@/res/dtd/* @RESPATH@/res/language.properties +@RESPATH@/res/locale/layout/HtmlForm.properties #ifdef XP_MACOSX @RESPATH@/res/MainMenu.nib/ #endif diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index ca8ad1d26b26..d7ab544f7274 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -3507,7 +3507,7 @@ void nsContentUtils::GetEventArgNames(int32_t aNameSpaceID, nsAtom* aEventName, // Note: The list of content bundles in nsStringBundle.cpp should be updated // whenever entries are added or removed from this list. -static const char gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT][56] = { +static const char* gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT] = { // Must line up with the enum values in |PropertiesFile| enum. "chrome://global/locale/css.properties", "chrome://global/locale/xbl.properties", @@ -3522,7 +3522,9 @@ static const char gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT][56] = { "chrome://global/locale/commonDialogs.properties", "chrome://global/locale/mathml/mathml.properties", "chrome://global/locale/security/security.properties", - "chrome://necko/locale/necko.properties"}; + "chrome://necko/locale/necko.properties", + "chrome://global/locale/layout/HtmlForm.properties", + "resource://gre/res/locale/layout/HtmlForm.properties"}; /* static */ nsresult nsContentUtils::EnsureStringBundle(PropertiesFile aFile) { @@ -3571,10 +3573,22 @@ void nsContentUtils::AsyncPrecreateStringBundles() { } } +static bool SpoofLocaleEnglish() { + // 0 - will prompt + // 1 - don't spoof + // 2 - spoof + return StaticPrefs::privacy_spoof_english() == 2; +} + /* static */ nsresult nsContentUtils::GetLocalizedString(PropertiesFile aFile, const char* aKey, nsAString& aResult) { + // When we spoof English, use en-US default strings in HTML forms. + if (aFile == eFORMS_PROPERTIES_MAYBESPOOF && SpoofLocaleEnglish()) { + aFile = eFORMS_PROPERTIES_en_US; + } + nsresult rv = EnsureStringBundle(aFile); NS_ENSURE_SUCCESS(rv, rv); nsIStringBundle* bundle = sStringBundles[aFile]; @@ -3587,6 +3601,11 @@ nsresult nsContentUtils::FormatLocalizedString(PropertiesFile aFile, const char16_t** aParams, uint32_t aParamsLength, nsAString& aResult) { + // When we spoof English, use en-US default strings in HTML forms. + if (aFile == eFORMS_PROPERTIES_MAYBESPOOF && SpoofLocaleEnglish()) { + aFile = eFORMS_PROPERTIES_en_US; + } + nsresult rv = EnsureStringBundle(aFile); NS_ENSURE_SUCCESS(rv, rv); nsIStringBundle* bundle = sStringBundles[aFile]; @@ -5120,11 +5139,13 @@ nsIWidget* nsContentUtils::GetTopLevelWidget(nsIWidget* aWidget) { const nsDependentString nsContentUtils::GetLocalizedEllipsis() { static char16_t sBuf[4] = {0, 0, 0, 0}; if (!sBuf[0]) { - nsAutoString tmp; - Preferences::GetLocalizedString("intl.ellipsis", tmp); - uint32_t len = - std::min(uint32_t(tmp.Length()), uint32_t(ArrayLength(sBuf) - 1)); - CopyUnicodeTo(tmp, 0, sBuf, len); + if (!SpoofLocaleEnglish()) { + nsAutoString tmp; + Preferences::GetLocalizedString("intl.ellipsis", tmp); + uint32_t len = + std::min(uint32_t(tmp.Length()), uint32_t(ArrayLength(sBuf) - 1)); + CopyUnicodeTo(tmp, 0, sBuf, len); + } if (!sBuf[0]) sBuf[0] = char16_t(0x2026); } return nsDependentString(sBuf); diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index de450090e9db..67febf189c34 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -1117,6 +1117,8 @@ class nsContentUtils { eMATHML_PROPERTIES, eSECURITY_PROPERTIES, eNECKO_PROPERTIES, + eFORMS_PROPERTIES_MAYBESPOOF, + eFORMS_PROPERTIES_en_US, PropertiesFile_COUNT }; static nsresult ReportToConsole( diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp index b7360a9ff3e7..dd0365a7646c 100644 --- a/dom/html/HTMLInputElement.cpp +++ b/dom/html/HTMLInputElement.cpp @@ -725,15 +725,15 @@ nsresult HTMLInputElement::InitFilePicker(FilePickerType aType) { nsAutoString title; nsAutoString okButtonLabel; if (aType == FILE_PICKER_DIRECTORY) { - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "DirectoryUpload", title); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, "DirectoryUpload", title); - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "DirectoryPickerOkButtonLabel", - okButtonLabel); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, + "DirectoryPickerOkButtonLabel", okButtonLabel); } else { - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "FileUpload", title); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, "FileUpload", title); } nsCOMPtr<nsIFilePicker> filePicker = @@ -2339,22 +2339,25 @@ void HTMLInputElement::GetDisplayFileName(nsAString& aValue) const { if ((IsDirPickerEnabled() && Allowdirs()) || (StaticPrefs::dom_webkitBlink_dirPicker_enabled() && HasAttr(kNameSpaceID_None, nsGkAtoms::webkitdirectory))) { - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "NoDirSelected", value); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, "NoDirSelected", value); } else if (HasAttr(kNameSpaceID_None, nsGkAtoms::multiple)) { - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "NoFilesSelected", value); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, "NoFilesSelected", + value); } else { - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "NoFileSelected", value); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, "NoFileSelected", + value); } } else { nsString count; count.AppendInt(int(mFileData->mFilesOrDirectories.Length())); const char16_t* params[] = {count.get()}; - nsContentUtils::FormatLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "XFilesSelected", params, value); + nsContentUtils::FormatLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, "XFilesSelected", params, + value); } aValue = value; @@ -5825,8 +5828,8 @@ HTMLInputElement::SubmitNamesValues(HTMLFormSubmission* aFormSubmission) { !HasAttr(kNameSpaceID_None, nsGkAtoms::value)) { // Get our default value, which is the same as our default label nsAutoString defaultValue; - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "Submit", defaultValue); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, "Submit", defaultValue); value = defaultValue; } diff --git a/dom/locales/moz.build b/dom/locales/moz.build index 1734739c5426..b2bcd271de7c 100644 --- a/dom/locales/moz.build +++ b/dom/locales/moz.build @@ -59,3 +59,7 @@ with Files("en-US/chrome/plugins.properties"): BUG_COMPONENT = ("Core", "Plug-ins") JAR_MANIFESTS += ['jar.mn'] + +RESOURCE_FILES.locale.layout += [ + 'en-US/chrome/layout/HtmlForm.properties', +] diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index 4941b7f9780a..7a5a96d1769a 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -1654,8 +1654,8 @@ already_AddRefed<nsIContent> nsCSSFrameConstructor::CreateGeneratedContent( } nsAutoString temp; - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "Submit", temp); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, "Submit", temp); return CreateGenConTextNode(aState, temp, nullptr, nullptr); } @@ -7899,8 +7899,8 @@ void nsCSSFrameConstructor::GetAlternateTextFor(Element* aElement, nsAtom* aTag, // If there's no "value" attribute either, then use the localized string for // "Submit" as the alternate text. - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "Submit", aAltText); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, "Submit", aAltText); } } diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp index 5774f9f9275f..9be30011aa8e 100644 --- a/layout/forms/nsFileControlFrame.cpp +++ b/layout/forms/nsFileControlFrame.cpp @@ -215,8 +215,8 @@ static already_AddRefed<Element> MakeAnonButton(Document* aDoc, // Set the file picking button text depending on the current locale. nsAutoString buttonTxt; - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - labelKey, buttonTxt); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, labelKey, buttonTxt); // Set the browse button text. It's a bit of a pain to do because we want to // make sure we are not notifying. diff --git a/layout/forms/nsGfxButtonControlFrame.cpp b/layout/forms/nsGfxButtonControlFrame.cpp index a35765a2cb5e..03186ef7bf54 100644 --- a/layout/forms/nsGfxButtonControlFrame.cpp +++ b/layout/forms/nsGfxButtonControlFrame.cpp @@ -88,8 +88,8 @@ nsresult nsGfxButtonControlFrame::GetDefaultLabel(nsAString& aString) const { return NS_OK; } - return nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - prop, aString); + return nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, prop, aString); } nsresult nsGfxButtonControlFrame::GetLabel(nsString& aLabel) { diff --git a/layout/generic/DetailsFrame.cpp b/layout/generic/DetailsFrame.cpp index 9f4e909f3952..e1a9f0c70b2b 100644 --- a/layout/generic/DetailsFrame.cpp +++ b/layout/generic/DetailsFrame.cpp @@ -98,8 +98,9 @@ nsresult DetailsFrame::CreateAnonymousContent( mDefaultSummary = new HTMLSummaryElement(nodeInfo.forget()); nsAutoString defaultSummaryText; - nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, - "DefaultSummary", defaultSummaryText); + nsContentUtils::GetLocalizedString( + nsContentUtils::eFORMS_PROPERTIES_MAYBESPOOF, "DefaultSummary", + defaultSummaryText); RefPtr<nsTextNode> description = new nsTextNode(nodeInfoManager); description->SetText(defaultSummaryText, false); mDefaultSummary->AppendChildTo(description, false); diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 816589393562..3d014cbc6e67 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -201,6 +201,7 @@ @BINPATH@/res/grabber.gif @BINPATH@/res/dtd/* @BINPATH@/res/language.properties +@BINPATH@/res/locale/layout/HtmlForm.properties #ifndef MOZ_ANDROID_EXCLUDE_FONTS @BINPATH@/res/fonts/*

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-1] Revert "Bug 24056: Use en-US strings in HTML forms"
by gk＠torproject.org 29 Aug '19

29 Aug '19

commit 69bf59ac52f26317e93e2325a8e8c1d797f56c0c Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Aug 19 13:13:36 2019 +0200 Revert "Bug 24056: Use en-US strings in HTML forms" This reverts commit 243a68926e148a2590707ee9b3cb2364e2f42083. --- dom/base/nsContentUtils.cpp | 32 +++++++------------------------- dom/base/nsContentUtils.h | 3 --- 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index a7ff89977a95..ca8ad1d26b26 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -317,8 +317,6 @@ bool nsContentUtils::sBypassCSSOMOriginCheck = false; nsCString* nsContentUtils::sJSBytecodeMimeType = nullptr; -int32_t nsContentUtils::sSpoofEnglish = 0; - nsContentUtils::UserInteractionObserver* nsContentUtils::sUserInteractionObserver = nullptr; @@ -607,8 +605,6 @@ nsresult nsContentUtils::Init() { Preferences::AddBoolVarCache(&sAllowXULXBL_for_file, "dom.allow_XUL_XBL_for_file"); - Preferences::AddIntVarCache(&sSpoofEnglish, "privacy.spoof_english", 0); - #ifndef RELEASE_OR_BETA sBypassCSSOMOriginCheck = getenv("MOZ_BYPASS_CSSOM_ORIGIN_CHECK"); #endif @@ -3511,7 +3507,7 @@ void nsContentUtils::GetEventArgNames(int32_t aNameSpaceID, nsAtom* aEventName, // Note: The list of content bundles in nsStringBundle.cpp should be updated // whenever entries are added or removed from this list. -static const char* gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT] = { +static const char gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT][56] = { // Must line up with the enum values in |PropertiesFile| enum. "chrome://global/locale/css.properties", "chrome://global/locale/xbl.properties", @@ -3526,9 +3522,7 @@ static const char* gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT] = { "chrome://global/locale/commonDialogs.properties", "chrome://global/locale/mathml/mathml.properties", "chrome://global/locale/security/security.properties", - "chrome://necko/locale/necko.properties", - "resource://gre/chrome/en-US/locale/en-US/global/layout/" - "HtmlForm.properties"}; + "chrome://necko/locale/necko.properties"}; /* static */ nsresult nsContentUtils::EnsureStringBundle(PropertiesFile aFile) { @@ -3581,11 +3575,6 @@ void nsContentUtils::AsyncPrecreateStringBundles() { nsresult nsContentUtils::GetLocalizedString(PropertiesFile aFile, const char* aKey, nsAString& aResult) { - // When we spoof English, use en-US default strings in HTML forms. - if (aFile == eFORMS_PROPERTIES && sSpoofEnglish == 2) { - aFile = eFORMS_PROPERTIES_en_US; - } - nsresult rv = EnsureStringBundle(aFile); NS_ENSURE_SUCCESS(rv, rv); nsIStringBundle* bundle = sStringBundles[aFile]; @@ -3598,11 +3587,6 @@ nsresult nsContentUtils::FormatLocalizedString(PropertiesFile aFile, const char16_t** aParams, uint32_t aParamsLength, nsAString& aResult) { - // When we spoof English, use en-US default strings in HTML forms. - if (aFile == eFORMS_PROPERTIES && sSpoofEnglish == 2) { - aFile = eFORMS_PROPERTIES_en_US; - } - nsresult rv = EnsureStringBundle(aFile); NS_ENSURE_SUCCESS(rv, rv); nsIStringBundle* bundle = sStringBundles[aFile]; @@ -5136,13 +5120,11 @@ nsIWidget* nsContentUtils::GetTopLevelWidget(nsIWidget* aWidget) { const nsDependentString nsContentUtils::GetLocalizedEllipsis() { static char16_t sBuf[4] = {0, 0, 0, 0}; if (!sBuf[0]) { - if (sSpoofEnglish != 2) { - nsAutoString tmp; - Preferences::GetLocalizedString("intl.ellipsis", tmp); - uint32_t len = - std::min(uint32_t(tmp.Length()), uint32_t(ArrayLength(sBuf) - 1)); - CopyUnicodeTo(tmp, 0, sBuf, len); - } + nsAutoString tmp; + Preferences::GetLocalizedString("intl.ellipsis", tmp); + uint32_t len = + std::min(uint32_t(tmp.Length()), uint32_t(ArrayLength(sBuf) - 1)); + CopyUnicodeTo(tmp, 0, sBuf, len); if (!sBuf[0]) sBuf[0] = char16_t(0x2026); } return nsDependentString(sBuf); diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 4ea35a42f029..de450090e9db 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -1117,7 +1117,6 @@ class nsContentUtils { eMATHML_PROPERTIES, eSECURITY_PROPERTIES, eNECKO_PROPERTIES, - eFORMS_PROPERTIES_en_US, PropertiesFile_COUNT }; static nsresult ReportToConsole( @@ -3421,8 +3420,6 @@ class nsContentUtils { static int32_t sInnerOrOuterWindowCount; static uint32_t sInnerOrOuterWindowSerialCounter; - - static int32_t sSpoofEnglish; }; /* static */ inline nsContentPolicyType

1 0

[tor-browser-build/master] Bug 31173: Update android-toolchain project to match firefox
by gk＠torproject.org 29 Aug '19

29 Aug '19

commit 576c12b5e461df957731a7d4583d84a8e716ddaf Author: sisbell <shane.isbell(a)gmail.com> Date: Wed Jul 17 01:48:43 2019 -0700 Bug 31173: Update android-toolchain project to match firefox --- projects/android-toolchain/build | 21 +++++++++++---------- projects/android-toolchain/config | 28 ++++++++++++++-------------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index e0f59a9..42e961c 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -15,28 +15,29 @@ unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME # NDK Archive cd $NDK_HOME -mv android-ndk-r15c/* . -rm -fR android-ndk-r15c +mv android-ndk-r17b/* . +rm -fR android-ndk-r17b +# The architectures we support ./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_armv7") %] --arch arm --install-dir=./arm ./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_x86") %] --arch x86 --install-dir=./x86 ./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_aarch64") %] --arch arm64 --install-dir=./arm64 # Tool Archives cd $SDK_HOME -unzip -qq $HOME/[% c("input_files_by_name/build_tools_26") %] -d $SDK_HOME -mkdir -p build-tools/26.0.2 -mv android-8.1.0/* build-tools/26.0.2 +unzip -qq $HOME/[% c("input_files_by_name/build_tools") %] -d $SDK_HOME +mkdir -p build-tools/27.0.3 +mv android-8.1.0/* build-tools/27.0.3 -unzip -qq $HOME/[% c("input_files_by_name/platform_26") %] -d $SDK_HOME -mkdir -p platforms/android-26 -mv android-8.0.0/* platforms/android-26 +unzip -qq $HOME/[% c("input_files_by_name/platform") %] -d $SDK_HOME +mkdir -p platforms/android-28 +mv android-9/* platforms/android-28 -unzip -qq $HOME/[% c("input_files_by_name/platform_tools_26") %] -d $SDK_HOME +unzip -qq $HOME/[% c("input_files_by_name/platform_tools") %] -d $SDK_HOME # Cleanup rm -fR android-8.1.0 -rm -fR android-8.0.0 +rm -fR android-9 # Archive dist directory cd /var/tmp/dist diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 8a4c413..8c9c822 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 26.0.2 +version: 27.0.3 var: container: use_container: 1 @@ -18,21 +18,21 @@ var: google_repo: https://dl.google.com/android/repository input_files: - project: container-image - - URL: '[% c("var/google_repo") %]/build-tools_r26.0.2-linux.zip' - name: build_tools_26 - sha256sum: a752849fac85c4a7f9ea165ec8f367b0ebe8bbf6a1f33fc8605342be004231ce - - URL: '[% c("var/google_repo") %]/platform-26_r02.zip' - name: platform_26 - sha256sum: 2aafa7d19c5e9c4b643ee6ade3d85ef89dc2f79e8383efdb9baf7fddad74b52a - - URL: '[% c("var/google_repo") %]/platform-tools_r26.0.2-linux.zip' - name: platform_tools_26 - sha256sum: 63b15a38c2b64e6ec8b54febe9f69fce5fe6c898c554c73b826b49daf7b52519 + - URL: '[% c("var/google_repo") %]/build-tools_r27.0.3-linux.zip' + name: build_tools + sha256sum: 5e1f4fc5203f13de120c56f9cc103bb2e57d940959547506196ab10ddc9e6b97 + - URL: '[% c("var/google_repo") %]/platform-28_r04.zip' + name: platform + sha256sum: 967f8ca99b71d337aa9c7781f9d65dd8110bf5c4746f44304047bf71b20d0ded + - URL: '[% c("var/google_repo") %]/platform-tools_r28.0.3-linux.zip' + name: platform_tools + sha256sum: 38fccfe8d2646dd12bdd7cad22fedba0493425b98ebd6d620e4c670b9af4c53f - URL: '[% c("var/google_repo") %]/sdk-tools-linux-4333796.zip' name: android_sdk_tools sha256sum: 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9 - - URL: '[% c("var/google_repo") %]/android-ndk-r15c-linux-x86_64.zip' + - URL: '[% c("var/google_repo") %]/android-ndk-r17b-linux-x86_64.zip' name: android_ndk_compiler - sha256sum: f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c - - URL: https://services.gradle.org/distributions/gradle-4.1-bin.zip + sha256sum: 5dfbbdc2d3ba859fed90d0e978af87c71a91a5be1f6e1c40ba697503d48ccecd + - URL: https://services.gradle.org/distributions/gradle-4.10.2-bin.zip name: gradle_bin - sha256sum: d55dfa9cfb5a3da86a1c9e75bb0b9507f9a8c8c100793ccec7beb6e259f9ed43 + sha256sum: b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 29 Aug '19

29 Aug '19

commit bd3c6c4beaf4c0ee004c841d8474e26b32925692 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 19 07:38:56 2019 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes bug 31141. --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 08fe0e8d301e..f9114b7a892e 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -371,7 +371,7 @@ pref("font.name.sans-serif.ar", "Arial"); #endif #ifdef XP_WIN -pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft Himalaya, Microsoft JhengHei, Microsoft JengHei UI, Microsoft YaHei, 微软雅黑, Microsoft YaHei UI, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI"); +pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft Himalaya, Microsoft JhengHei, Microsoft JhengHei UI, Microsoft YaHei, 微软雅黑, Microsoft YaHei UI, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI"); #endif #ifdef XP_LINUX

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 29 Aug '19

29 Aug '19

commit 1d8ad2218d07aa58e1887cb238499d08b70c190d Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Aug 28 18:51:12 2019 +0200 squash! TB4: Tor Browser's Firefox preference overrides. Bug 31396: Disable indexedDB WebExtension storage backend. --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 8a83eac60400..08fe0e8d301e 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -277,6 +277,8 @@ pref("extensions.getAddons.showPane", false); pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},torbutton(a)torproject.org"); // Bug 26114: Allow NoScript to access addons.mozilla.org etc. pref("extensions.webextensions.restrictedDomains", ""); +// Bug 31396: Disable indexedDB WebExtension storage backend. +pref("extensions.webextensions.ExtensionStorageIDB.enabled", false); // Toolbar layout pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"torbutton-button\",\"security-level-button\",\"downloads-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"https-everywhere-eff_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"currentVersion\":14,\"newElementCount \":1}");

1 0

[tor-browser-build/master] Picking up first 68.1.0esr branch for nightly builds
by gk＠torproject.org 28 Aug '19

28 Aug '19

commit d2c194dd5f82de9bbd9ec7c7e7e34e3c7a5a4684 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 28 21:37:32 2019 +0000 Picking up first 68.1.0esr branch for nightly builds --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 17a707a..34d6fad 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox/config b/projects/firefox/config index 799861e..06f7c60 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.0 + firefox_platform_version: 68.1.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.0 torbrowser_update_channel: alpha @@ -51,7 +51,7 @@ targets: branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/official' nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-3' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 var: torbrowser_update_channel: default

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-1] Bug 1572844 - Consistently check for MOZ_BITS_DOWNLOAD
by gk＠torproject.org 28 Aug '19

28 Aug '19

commit adb1614b652a5be21e7f025d15a8ea48401eeb02 Author: Adam Gashlin <agashlin(a)mozilla.com> Date: Mon Aug 19 15:44:42 2019 -0700 Bug 1572844 - Consistently check for MOZ_BITS_DOWNLOAD --- toolkit/components/bitsdownload/components.conf | 2 +- toolkit/components/bitsdownload/moz.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toolkit/components/bitsdownload/components.conf b/toolkit/components/bitsdownload/components.conf index d8a7b5721e00..fe7090d366be 100644 --- a/toolkit/components/bitsdownload/components.conf +++ b/toolkit/components/bitsdownload/components.conf @@ -5,7 +5,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. Classes = [] -if buildconfig.substs['OS_ARCH'] == 'WINNT' and defined('MOZ_BITS_DOWNLOAD'): +if defined('MOZ_BITS_DOWNLOAD'): Classes += [ { 'cid': '{495d6f3d-9748-4d30-8ce5-0290c0001edf}', diff --git a/toolkit/components/bitsdownload/moz.build b/toolkit/components/bitsdownload/moz.build index 1d3f45937bdb..5f1dc96e9490 100644 --- a/toolkit/components/bitsdownload/moz.build +++ b/toolkit/components/bitsdownload/moz.build @@ -14,7 +14,7 @@ XPCOM_MANIFESTS += [ 'components.conf', ] -if CONFIG['OS_ARCH'] == 'WINNT': +if CONFIG['MOZ_BITS_DOWNLOAD']: EXPORTS += [ 'Bits.h' ]

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-1] Pick up Torbutton esr68 changes
by gk＠torproject.org 28 Aug '19

28 Aug '19

commit 489a4f07172f64ee5c9bd86a4426b5de64a9448a Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 28 21:35:04 2019 +0000 Pick up Torbutton esr68 changes --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index ac8d92514940..605decfd4ddc 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit ac8d9251494056e761bb2cf5c2a4795a888f38bd +Subproject commit 605decfd4ddc81eb37da17172f48f92fd7f7e451

1 0

[tor-browser-build/master] Bug 30490: Adapt cbindgen for Windows 32bit usage
by boklm＠torproject.org 28 Aug '19

28 Aug '19

commit 84d95d6d2a51d93f62e9927cfa2e63e674066c7d Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 26 21:21:20 2019 +0000 Bug 30490: Adapt cbindgen for Windows 32bit usage --- projects/cbindgen/build | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/projects/cbindgen/build b/projects/cbindgen/build index 429f567..402a216 100644 --- a/projects/cbindgen/build +++ b/projects/cbindgen/build @@ -22,8 +22,13 @@ replace-with = "vendored-sources" directory = "/var/tmp/build/cbindgen/vendor" EOF -cargo build --release --frozen --target x86_64-unknown-linux-gnu -mv target/x86_64-unknown-linux-gnu/release/cbindgen $distdir/[% project %] +[% IF ! c("var/windows-i686") -%] + target=x86_64 +[% ELSE -%] + target=i686 +[% END -%] +cargo build --release --frozen --target $target-unknown-linux-gnu +mv target/$target-unknown-linux-gnu/release/cbindgen $distdir/[% project %] cd $distdir [% c('tar', {

1 0