- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 24653: merge securityLevel.properties into torbutton.dtd
by gk＠torproject.org 13 Sep '19

13 Sep '19

commit 3b5b0d6d502d712734c2c5b7e35c0d29e5f19204 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Aug 13 11:57:22 2019 +0200 Bug 24653: merge securityLevel.properties into torbutton.dtd --- .../securitylevel/content/securityLevel.js | 89 +++++++++++++--------- 1 file changed, 52 insertions(+), 37 deletions(-) diff --git a/browser/components/securitylevel/content/securityLevel.js b/browser/components/securitylevel/content/securityLevel.js index 25f6423bc6d3..9dc23d97855d 100644 --- a/browser/components/securitylevel/content/securityLevel.js +++ b/browser/components/securitylevel/content/securityLevel.js @@ -8,61 +8,76 @@ XPCOMUtils.defineLazyModuleGetters(this, { PanelMultiView: "resource:///modules/PanelMultiView.jsm", }); +XPCOMUtils.defineLazyGlobalGetters(this, ["DOMParser"]); +XPCOMUtils.defineLazyGetter(this, "domParser", () => new DOMParser()); + /* Security Level Strings Strings loaded from torbutton, but en-US defaults provided in case torbutton addon not enabled */ XPCOMUtils.defineLazyGetter(this, "SecurityLevelStrings", function() { - let sls = null; - try { - sls = Services.strings.createBundle("chrome://torbutton/locale/securityLevel.properties"); - } catch(e) { } + // copied from testing/marionette/l10n.js + let localizeEntity = function(urls, id) { + // Build a string which contains all possible entity locations + let locations = []; + urls.forEach((url, index) => { + locations.push(`<!ENTITY % dtd_${index} SYSTEM "${url}">%dtd_${index};`); + }); + + // Use the DOM parser to resolve the entity and extract its real value + let header = `<?xml version="1.0"?><!DOCTYPE elem [${locations.join("")}]>`; + let elem = `<elem id="elementID">&${id};</elem>`; + let doc = domParser.parseFromString(header + elem, "text/xml"); + let element = doc.querySelector("elem[id='elementID']"); + + if (element === null) { + throw new Error(`Entity with id='${id}' hasn't been found`); + } + + return element.textContent; + }; - // tries to get the given key from the string bundle, return fallback on failure let getString = function(key, fallback) { - let retval = ""; - if (sls) { - try { - retval = sls.GetStringFromName(key); - } catch(e) { } - } - if (retval == "") { - retval = fallback; - } - return retval; + try { + return localizeEntity( + ['chrome://torbutton/locale/torbutton.dtd'], + `torbutton.prefs.sec_${key}` + ); + } catch (e) { } + return fallback; }; // read localized strings from torbutton; but use hard-coded en-US strings as fallbacks in case of error let retval = { - securityLevel : getString("securityLevel.securityLevel", "Security Level"), - customWarning : getString("securityLevel.customWarning", "Custom"), - overview : getString("securityLevel.overview", "Disable certain web features that can be used to attack your security and anonymity."), + securityLevel : getString("caption", "Security Level"), + customWarning : getString("custom_warning", "Custom"), + overview : getString("overview", "Disable certain web features that can be used to attack your security and anonymity."), standard : { - level : getString("securityLevel.standard.level", "Standard"), - tooltip : getString("securityLevel.standard.tooltip", "Security Level : Standard"), - summary : getString("securityLevel.standard.summary", "All Tor Browser and website features are enabled."), + level : getString("standard_label", "Standard"), + tooltip : getString("standard_tooltip", "Security Level : Standard"), + summary : getString("standard_description", "All Tor Browser and website features are enabled."), }, safer : { - level : getString("securityLevel.safer.level", "Safer"), - tooltip : getString("securityLevel.safer.tooltip", "Security Level : Safer"), - summary : getString("securityLevel.safer.summary", "Disables website features that are often dangerous, causing some sites to lose functionality."), - description1 : getString("securityLevel.safer.description1", "JavaScript is disabled on non-HTTPS sites."), - description2 : getString("securityLevel.safer.description2", "Some fonts and math symbols are disabled."), - description3 : getString("securityLevel.safer.description3", "Audio and video (HTML5 media) are click-to-play."), + level : getString("safer_label", "Safer"), + tooltip : getString("safer_tooltip", "Security Level : Safer"), + summary : getString("safer_description", "Disables website features that are often dangerous, causing some sites to lose functionality."), + description1 : getString("js_on_https_sites_only", "JavaScript is disabled on non-HTTPS sites."), + description2 : getString("limit_typography", "Some fonts and math symbols are disabled."), + description3 : getString("click_to_play_media", "Audio and video (HTML5 media), and WebGL are click-to-play."), }, safest : { - level : getString("securityLevel.safest.level", "Safest"), - tooltip : getString("securityLevel.safest.tooltip", "Security Level : Safest"), - summary : getString("securityLevel.safest.summary", "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."), - description1 : getString("securityLevel.safest.description1", "JavaScript is disabled by default on all sites."), - description2 : getString("securityLevel.safest.description2", "Some fonts, icons, math symbols, and images are disabled."), - description3 : getString("securityLevel.safest.description3", "Audio and video (HTML5 media) are click-to-play."), + level : getString("safest_label", "Safest"), + tooltip : getString("safest_tooltip", "Security Level : Safest"), + summary : getString("safest_description", "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."), + description1 : getString("js_disabled", "JavaScript is disabled by default on all sites."), + description2 : getString("limit_graphics_and_typography", "Some fonts, icons, math symbols, and images are disabled."), + description3 : getString("click_to_play_media", "Audio and video (HTML5 media), and WebGL are click-to-play."), }, custom : { - summary : getString("securityLevel.custom.summary", "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."), + summary : getString("custom_summary", "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."), }, - learnMore : getString("securityLevel.learnMore", "Learn more"), + learnMore : getString("learn_more_label", "Learn more"), learnMoreURL : function() { let locale = ""; try { @@ -77,8 +92,8 @@ XPCOMUtils.defineLazyGetter(this, "SecurityLevelStrings", function() { return "https://tb-manual.torproject.org/" + locale + "/security-settings/"; }(), - restoreDefaults : getString("securityLevel.restoreDefaults", "Restore Defaults"), - advancedSecuritySettings : getString("securityLevel.advancedSecuritySettings", "Advanced Security Settings\u2026"), + restoreDefaults : getString("restore_defaults", "Restore Defaults"), + advancedSecuritySettings : getString("advanced_security_settings", "Advanced Security Settings\u2026"), };

1 0

[torbutton/master] Translations update
by gk＠torproject.org 12 Sep '19

12 Sep '19

commit e0e77b8066e782d919d7a6b752590b419d6e552d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 12 08:25:23 2019 +0000 Translations update --- chrome/locale/it/aboutTBUpdate.dtd | 2 +- chrome/locale/nl/aboutTBUpdate.dtd | 4 ++-- chrome/locale/nl/aboutTor.dtd | 6 +++--- chrome/locale/nl/torbutton.dtd | 4 ++-- chrome/locale/zh-TW/torbutton.dtd | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/chrome/locale/it/aboutTBUpdate.dtd b/chrome/locale/it/aboutTBUpdate.dtd index e40ec576..d179811b 100644 --- a/chrome/locale/it/aboutTBUpdate.dtd +++ b/chrome/locale/it/aboutTBUpdate.dtd @@ -1,5 +1,5 @@ <!ENTITY aboutTBUpdate.changelogTitle "Cronologia Tor Browser"> -<!ENTITY aboutTBUpdate.updated "Il Browser TOR è stato aggiornato."> +<!ENTITY aboutTBUpdate.updated "Il Tor Browser è stato aggiornato."> <!ENTITY aboutTBUpdate.linkPrefix "Per maggiori informazioni su questa versione,"> <!ENTITY aboutTBUpdate.linkLabel "visita il nostro sito web"> <!ENTITY aboutTBUpdate.linkSuffix "."> diff --git a/chrome/locale/nl/aboutTBUpdate.dtd b/chrome/locale/nl/aboutTBUpdate.dtd index 56f0e81d..6d078b5d 100644 --- a/chrome/locale/nl/aboutTBUpdate.dtd +++ b/chrome/locale/nl/aboutTBUpdate.dtd @@ -1,8 +1,8 @@ -<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser-changelog"> +<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser-wijzigingslog"> <!ENTITY aboutTBUpdate.updated "Tor Browser is bijgewerkt."> <!ENTITY aboutTBUpdate.linkPrefix "Bezoek "> <!ENTITY aboutTBUpdate.linkLabel "onze website"> <!ENTITY aboutTBUpdate.linkSuffix " voor de meest actuele informatie over deze release."> <!ENTITY aboutTBUpdate.version "Versie"> -<!ENTITY aboutTBUpdate.releaseDate "Releasedatum"> +<!ENTITY aboutTBUpdate.releaseDate "Uitgavedatum"> <!ENTITY aboutTBUpdate.releaseNotes "Uitgaveopmerkingen"> diff --git a/chrome/locale/nl/aboutTor.dtd b/chrome/locale/nl/aboutTor.dtd index b4ac52c4..68f4c848 100644 --- a/chrome/locale/nl/aboutTor.dtd +++ b/chrome/locale/nl/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "Over Tor"> -<!ENTITY aboutTor.viewChangelog.label "Wijzigingslog bekijken"> +<!ENTITY aboutTor.viewChangelog.label "Wijzigingslogboek bekijken"> <!ENTITY aboutTor.ready.label "Verken. Privé."> <!ENTITY aboutTor.ready2.label "U bent klaar voor de meest private surfervaring ter wereld."> @@ -19,10 +19,10 @@ <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Vragen?"> <!ENTITY aboutTor.torbrowser_user_manual_link.label "Bekijk onze Tor Browser-handleiding »">  -<!ENTITY aboutTor.torbrowser_user_manual.accesskey "h"> +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "H"> <!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser-handleiding"> -<!ENTITY aboutTor.tor_mission.label "Het Tor Project is een US 501(c)(3)-non-profitorganisatie die de rechten en vrijheden van de mens bevordert door vrije en open source anonimiteits- en privacytechnologie te maken en toe te passen, hun onbeperkte beschikbaarheid en gebruik te steunen, en hun wetenschappelijke en populaire begrip te bevorderen."> +<!ENTITY aboutTor.tor_mission.label "Het Tor Project is een 501(c)(3)-organisatie zonder winstoogmerk gevestigd in de VS die rechten en vrijheden van de mens bevordert door vrije en open-broncode anonimiteits- en privacytechnologieën te ontwikkelen en te implementeren, de onbeperkte beschikbaarheid en het gebruik ervan te steunen, en het begrip ervoor in de wetenschap en bij het algemeen publiek te bevorderen."> <!ENTITY aboutTor.getInvolved.label "Meedoen »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> diff --git a/chrome/locale/nl/torbutton.dtd b/chrome/locale/nl/torbutton.dtd index 7125d44f..a49811bb 100644 --- a/chrome/locale/nl/torbutton.dtd +++ b/chrome/locale/nl/torbutton.dtd @@ -26,10 +26,10 @@ <!ENTITY torbutton.prefs.sec_standard_label "Standaard"> <!ENTITY torbutton.prefs.sec_standard_description "Alle Tor Browser- en websitefuncties zijn ingeschakeld."> <!ENTITY torbutton.prefs.sec_safer_label "Veiliger"> -<!ENTITY torbutton.prefs.sec_safer_description "Uitgeschakelde websitefuncties die zijn meestal gevaarlijk, waardoor sommige sites functionaliteit vaak verliezen."> +<!ENTITY torbutton.prefs.sec_safer_description "Schakelt websitefuncties uit die vaak gevaarlijk zijn, waardoor sommige websites functionaliteit verliezen."> <!ENTITY torbutton.prefs.sec_safer_list_label "Op de veiliger instelling:"> <!ENTITY torbutton.prefs.sec_safest_label "Veiligste"> -<!ENTITY torbutton.prefs.sec_safest_description "Alleen websitefuncties toestaan die vereist zijn voor statische sites en basis diensten. Deze wijzigingen zijn van invloed op afbeeldingen, media en scripts."> +<!ENTITY torbutton.prefs.sec_safest_description "Alleen websitefuncties toestaan die voor statische websites en basisservices zijn vereist. Deze wijzigingen zijn van invloed op afbeeldingen, media en scripts."> <!ENTITY torbutton.prefs.sec_safest_list_label "Op de veiligste instelling:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Leer Meer"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript zijn uitgeschakeld op non-HTTP sites."> diff --git a/chrome/locale/zh-TW/torbutton.dtd b/chrome/locale/zh-TW/torbutton.dtd index 7868343e..2839961a 100644 --- a/chrome/locale/zh-TW/torbutton.dtd +++ b/chrome/locale/zh-TW/torbutton.dtd @@ -34,8 +34,8 @@ <!ENTITY torbutton.prefs.sec_learn_more_label "繼續閱讀"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "所有非HTTPS網站會預設停用JavaScript "> <!ENTITY torbutton.prefs.sec_js_disabled "所有網站會預設停用JavaScript "> -<!ENTITY torbutton.prefs.sec_limit_typography "有些字形與數學符號被停用"> -<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "有些字型,圖標,數學符號與圖片被停用"> +<!ENTITY torbutton.prefs.sec_limit_typography "有些字型與數學符號被停用。"> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "有些字型、圖示、數學符號與圖片被停用。"> <!ENTITY torbutton.prefs.sec_click_to_play_media "聲音和影片（HTML5 媒體），和 WebGL 要點擊播放。"> <!ENTITY torbutton.circuit_display.title "Tor 迴路"> <!ENTITY torbutton.circuit_display.new_circuit "建立新的迴路來連接上此網站">

1 0

[tor-browser-build/master] Add missing Changelog item for 9.0a6
by gk＠torproject.org 11 Sep '19

11 Sep '19

commit e82857e90d8bbbf963d5060b6ea4922625162136 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 11 17:33:22 2019 +0000 Add missing Changelog item for 9.0a6 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index f97cb65..2ecd3d1 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -51,6 +51,7 @@ Tor Browser 9.0a6 -- September 4 2019 * Backport fix for bug 1572844 to fix broken build * OS X * Bug 29818: Adapt #13379 patch for 68esr + * Bug 31464: meek and moat are broken on macOS 10.9 with Go 1.12 * Bug 31403: Bump snowflake commit to cd650fa009 * Linux * Bug 31403: Bump snowflake commit to cd650fa009

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_31596'
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit 4e92d40f4cee86426752aa21f7ddbb102be9d0c9 Merge: f08dbd5 3ea80a4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 11 13:02:09 2019 +0200 Merge remote-tracking branch 'gk/bug_31596' projects/mingw-w64-clang/31567_1.patch | 33 -------------- projects/mingw-w64-clang/31567_2.patch | 82 ---------------------------------- projects/mingw-w64-clang/build | 3 +- projects/mingw-w64-clang/config | 4 +- projects/mingw-w64/config | 2 +- 5 files changed, 3 insertions(+), 121 deletions(-)

1 0

[tor-browser-build/master] Bug 31596: Bump mingw-w64 version for fix for #31567
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit 3ea80a42a85edc5e931cd241218cc5f0f2ff5b57 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 3 06:22:58 2019 +0000 Bug 31596: Bump mingw-w64 version for fix for #31567 --- projects/mingw-w64-clang/31567_1.patch | 33 -------------- projects/mingw-w64-clang/31567_2.patch | 82 ---------------------------------- projects/mingw-w64-clang/build | 3 +- projects/mingw-w64-clang/config | 4 +- projects/mingw-w64/config | 2 +- 5 files changed, 3 insertions(+), 121 deletions(-) diff --git a/projects/mingw-w64-clang/31567_1.patch b/projects/mingw-w64-clang/31567_1.patch deleted file mode 100644 index be316ee..0000000 --- a/projects/mingw-w64-clang/31567_1.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d9c7a5aa3ac8d29b98f28af71d862c2d3931e7d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin(a)martin.st> -Date: Sun, 1 Sep 2019 06:05:40 +0000 -Subject: [PATCH 1/2] This function was moved from inline in header to a - statically linked one in 52a34d52d6f5f1789d329abd4e, where the use of this - define was dropped. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -As this function is statically linked, the caller can't control -and change the behaviour of the function by defining -UCRTBASE_PRINTF_DEFAULT_WIDE in the calling translation unit, -but we should at least use the headers' default value (which currently -is zero). - -Signed-off-by: Martin Storsjö <martin(a)martin.st> - -diff --git a/mingw-w64-crt/stdio/ucrt__vsnwprintf.c b/mingw-w64-crt/stdio/ucrt__vsnwprintf.c -index bf9f4de2..c505c31e 100644 ---- a/mingw-w64-crt/stdio/ucrt__vsnwprintf.c -+++ b/mingw-w64-crt/stdio/ucrt__vsnwprintf.c -@@ -10,6 +10,6 @@ - - int __cdecl _vsnwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args) __MINGW_ATTRIB_DEPRECATED_SEC_WARN - { -- return __stdio_common_vswprintf(UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, _Dest, _Count, _Format, NULL, _Args); -+ return __stdio_common_vswprintf(UCRTBASE_PRINTF_DEFAULT_WIDE | UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, _Dest, _Count, _Format, NULL, _Args); - } - int __cdecl (*__MINGW_IMP_SYMBOL(_vsnwprintf))(wchar_t *__restrict__, size_t, const wchar_t *__restrict__, va_list) = _vsnwprintf; --- -2.23.0.rc1 - diff --git a/projects/mingw-w64-clang/31567_2.patch b/projects/mingw-w64-clang/31567_2.patch deleted file mode 100644 index 12070aa..0000000 --- a/projects/mingw-w64-clang/31567_2.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 44d0691f6fa51d2b3a0df911652c801635424e4e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin(a)martin.st> -Date: Sun, 1 Sep 2019 06:08:24 +0000 -Subject: [PATCH 2/2] When __USE_MINGW_ANSI_STDIO is defined, we still call the - custom implementation bundled in libmingwex, which has the C99 standard - semantics for %s in wide format strings. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This matches how the wide stdio functions behave both when using -msvcrt.dll, and in all versions of MSVC, even the modern ones that -use ucrt. - -Signed-off-by: Martin Storsjö <martin(a)martin.st> - -diff --git a/mingw-w64-headers/crt/conio.h b/mingw-w64-headers/crt/conio.h -index 363203c3..a92ee059 100644 ---- a/mingw-w64-headers/crt/conio.h -+++ b/mingw-w64-headers/crt/conio.h -@@ -21,12 +21,13 @@ - #define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) - #define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) - --// Default wide printfs and scanfs to the standard mode -+// Default wide printfs and scanfs to the legacy wide mode. Only code built -+// with -D__USE_MINGW_ANSI_STDIO=1 will expect the standard behaviour. - #ifndef UCRTBASE_PRINTF_DEFAULT_WIDE --#define UCRTBASE_PRINTF_DEFAULT_WIDE 0 -+#define UCRTBASE_PRINTF_DEFAULT_WIDE UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS - #endif - #ifndef UCRTBASE_SCANF_DEFAULT_WIDE --#define UCRTBASE_SCANF_DEFAULT_WIDE 0 -+#define UCRTBASE_SCANF_DEFAULT_WIDE UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS - #endif - #endif - -diff --git a/mingw-w64-headers/crt/stdio.h b/mingw-w64-headers/crt/stdio.h -index e183236d..e8d3c857 100644 ---- a/mingw-w64-headers/crt/stdio.h -+++ b/mingw-w64-headers/crt/stdio.h -@@ -147,12 +147,13 @@ extern FILE (* __MINGW_IMP_SYMBOL(_iob))[]; /* A pointer to an array of FILE */ - #define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) - #define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) - --// Default wide printfs and scanfs to the standard mode -+// Default wide printfs and scanfs to the legacy wide mode. Only code built -+// with -D__USE_MINGW_ANSI_STDIO=1 will expect the standard behaviour. - #ifndef UCRTBASE_PRINTF_DEFAULT_WIDE --#define UCRTBASE_PRINTF_DEFAULT_WIDE 0 -+#define UCRTBASE_PRINTF_DEFAULT_WIDE UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS - #endif - #ifndef UCRTBASE_SCANF_DEFAULT_WIDE --#define UCRTBASE_SCANF_DEFAULT_WIDE 0 -+#define UCRTBASE_SCANF_DEFAULT_WIDE UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS - #endif - #endif - -diff --git a/mingw-w64-headers/crt/wchar.h b/mingw-w64-headers/crt/wchar.h -index cd26e098..d1348bc2 100644 ---- a/mingw-w64-headers/crt/wchar.h -+++ b/mingw-w64-headers/crt/wchar.h -@@ -247,12 +247,13 @@ extern FILE (* __MINGW_IMP_SYMBOL(_iob))[]; /* A pointer to an array of FILE */ - #define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) - #define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) - --// Default wide printfs and scanfs to the standard mode -+// Default wide printfs and scanfs to the legacy wide mode. Only code built -+// with -D__USE_MINGW_ANSI_STDIO=1 will expect the standard behaviour. - #ifndef UCRTBASE_PRINTF_DEFAULT_WIDE --#define UCRTBASE_PRINTF_DEFAULT_WIDE 0 -+#define UCRTBASE_PRINTF_DEFAULT_WIDE UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS - #endif - #ifndef UCRTBASE_SCANF_DEFAULT_WIDE --#define UCRTBASE_SCANF_DEFAULT_WIDE 0 -+#define UCRTBASE_SCANF_DEFAULT_WIDE UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS - #endif - #endif - --- -2.23.0.rc1 - diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index 820346d..b4000f5 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -69,8 +69,7 @@ default_win32_winnt=0x601 cd $builddir/mingw-w64-clang patch -p1 < $rootdir/mingw-winrt.patch -patch -p1 < $rootdir/31567_1.patch -patch -p1 < $rootdir/31567_2.patch + cd mingw-w64-headers mkdir build && cd build ../configure --host=[% c("arch") %]-w64-mingw32 \ diff --git a/projects/mingw-w64-clang/config b/projects/mingw-w64-clang/config index 16adee8..a6b6cde 100644 --- a/projects/mingw-w64-clang/config +++ b/projects/mingw-w64-clang/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 2d52c4b3433e55b1c454f9567c0ae9adc4b83b41 +git_hash: 330025c54b85512d54b6960fad07498365c8fee3 version: '[% c("abbrev") %]' llvm_version: 8.0.0 gpg_keyring: clang.gpg @@ -36,5 +36,3 @@ input_files: - project: llvm-mingw name: llvm-mingw - filename: mingw-winrt.patch - - filename: 31567_1.patch - - filename: 31567_2.patch diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 3bb1dda..0145194 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 2d52c4b3433e55b1c454f9567c0ae9adc4b83b41 +git_hash: 330025c54b85512d54b6960fad07498365c8fee3 version: '[% c("abbrev") %]' var: container:

1 0

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

11 Sep '19

commit e489c5048b762b3226db23b6ea9ffc440617615e Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 9 17:49:40 2019 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 31601: Disable recommended extensions again --- browser/app/profile/000-tor-browser.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 81352dcbaece..b2cecfdb1a82 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -273,8 +273,9 @@ pref("xpinstall.whitelist.add", ""); pref("xpinstall.whitelist.add.36", ""); // We don't know what extensions Mozilla is advertising to our users and we // don't want to have some random Google Analytics script running either on the -// about:addons page, see bug 22073 and 22900. +// about:addons page, see bug 22073, 22900 and 31601. pref("extensions.getAddons.showPane", false); +pref("extensions.htmlaboutaddons.recommendations.enabled", false); // Show our legacy extensions directly on about:addons and get rid of the // warning for the default theme. pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},torbutton(a)torproject.org");

1 0

[tor-browser-build/master] Bug 31621: Add --verbose flag to mach again
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit 5648e1499c10d2565e2cd9ca23599b532df8cff4 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 4 18:53:58 2019 +0000 Bug 31621: Add --verbose flag to mach again The underlying node bug got worked around in Mozilla's bug 1500436 and we cherry-pick that patch onto our esr68 branches. Thanks to a cypherpunk for finding that bugfix. --- projects/firefox/build | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 1450576..1a7893d 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -104,9 +104,7 @@ rm -f js/src/configure # Android does not support --enable-bundled-fonts option ./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] [% IF ! c("var/android") %]--enable-bundled-fonts[% END -%] --with-branding=[% c("var/branding_directory") %] -# Don't build with --verbose anymore or otherwise Stylo compilation breaks on -# Linux. See: #30321 for details. -./mach build +./mach build --verbose [% IF c("var/android") %] # Building a multi-locale .apk

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_31621'
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit f08dbd57ed76faa08007608130da50c4f80a9d64 Merge: 873865a 5648e14 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 11 12:26:32 2019 +0200 Merge remote-tracking branch 'gk/bug_31621' projects/firefox/build | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 1500436 - Redirect node.js's stderr to a pipe. r=froydnj
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit 4458b4e8a09aaa759f1735b36aec860aa61f3ba7 Author: Mike Hommey <mh+mozilla(a)glandium.org> Date: Wed Jun 26 21:44:00 2019 +0000 Bug 1500436 - Redirect node.js's stderr to a pipe. r=froydnj This works around https://github.com/nodejs/node/issues/14752, which causes problems with make. Differential Revision: https://phabricator.services.mozilla.com/D35986 --HG-- extra : moz-landing-system : lando --- python/mozbuild/mozbuild/action/node.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/python/mozbuild/mozbuild/action/node.py b/python/mozbuild/mozbuild/action/node.py index de4e094a9471..73f13ac48503 100644 --- a/python/mozbuild/mozbuild/action/node.py +++ b/python/mozbuild/mozbuild/action/node.py @@ -52,14 +52,25 @@ def execute_node_cmd(node_cmd_list): print('Executing "{}"'.format(printable_cmd), file=sys.stderr) sys.stderr.flush() - output = subprocess.check_output(node_cmd_list) + # We need to redirect stderr to a pipe because + # https://github.com/nodejs/node/issues/14752 causes issues with make. + proc = subprocess.Popen( + node_cmd_list, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + + stdout, stderr = proc.communicate() + retcode = proc.wait() + + if retcode != 0: + print(stderr, file=sys.stderr) + sys.stderr.flush() + sys.exit(retcode) # Process the node script output # # XXX Starting with an empty list means that node scripts can # (intentionally or inadvertently) remove deps. Do we want this? deps = [] - for line in output.splitlines(): + for line in stdout.splitlines(): if 'dep:' in line: deps.append(line.replace('dep:', '')) else:

1 0

[tor-browser-build/master] Update rbm for #31264
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit 873865aa9dc3d3f734458e86dbe542db67ad1929 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 11 12:06:51 2019 +0200 Update rbm for #31264 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index e04f03f..5a41aae 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit e04f03f9626e993bb66d7784d258f95ca07bc769 +Subproject commit 5a41aae4a0d745f74b675d3c9c142b3d5fb3ca09

1 0