[tor-commits] [tor-messenger-build/master] Update to ESR 52.4.0

commit 80f161a095d6b2347bb066c53136f407a2aed2e2 Author: Arlo Breault arlolra@gmail.com Date: Tue Oct 10 12:24:18 2017 -0400

Update to ESR 52.4.0 --- ChangeLog | 4 ++++ .../0001-Set-Tor-Messenger-preferences.patch | 22 ++++++++++++++++------ ...c-21634-Autologin-default-should-be-false.patch | 4 ++-- .../0003-XMPP-in-band-registration.patch | 4 ++-- .../instantbird/0004-Remove-search-from-UI.patch | 4 ++-- .../0005-Add-Tor-Messenger-branding.patch | 4 ++-- ...ve-option-for-configuring-account-picture.patch | 4 ++-- .../0007-Modify-top-protocol-defaults.patch | 4 ++-- .../instantbird/0008-Modify-IRC-defaults.patch | 4 ++-- .../0009-Do-not-set-default-XMPP-server.patch | 4 ++-- projects/instantbird/0010-Modify-themes.patch | 4 ++-- projects/instantbird/0011-Remove-logging-UI.patch | 4 ++-- projects/instantbird/0012-Cert-override.patch | 4 ++-- .../0013-Display-all-traffic-over-Tor.patch | 4 ++-- .../instantbird/0014-Trac-17480-Content-sink.patch | 4 ++-- .../0015-SASL-ECDSA-NIST256P-CHALLENGE.patch | 4 ++-- ...-Use-built-in-functions-instead-of-an-svg.patch | 4 ++-- ...-Add-a-pref-to-disable-JavaScript-in-brow.patch | 4 ++-- ...517-Use-different-color-for-Add-Exception.patch | 4 ++-- ...21736-Hide-account-timestamp-from-message.patch | 6 +++--- ...wed-duplicated-files-for-Windows-and-Linu.patch | 4 ++-- ...g-13855-Use-known-onions-for-XMPP-servers.patch | 4 ++-- .../0022-Bug-16606-Automatic-XMPP-accounts.patch | 4 ++-- projects/instantbird/config | 2 +- ...0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 4 ++-- .../mozilla/0002-Trac-16475-Block-flash-too.patch | 4 ++-- projects/mozilla/0003-OSX-package-as-tar.bz2.patch | 4 ++-- projects/mozilla/0004-Updater-fixups-for-TM.patch | 4 ++-- ...ing-exceptions-even-w-inPrivateBrowsingMo.patch | 4 ++-- projects/mozilla/config | 2 +- tor-browser-build | 2 +- 31 files changed, 76 insertions(+), 62 deletions(-)

diff --git a/ChangeLog b/ChangeLog index a0da311..634af73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ Tor Messenger 0.5.0b2 -- * All Platforms + * Use the tor-browser-52.4.0esr-7.0-1-build1 tag on tor-browser + * Use the THUNDERBIRD_52_4_0_RELEASE tag on comm-esr52 + * Update tor-browser to 7.0.6 + * Update tor-browser-build to 8c4c05d * Linux * Trac 23806: libotr.so and libgcrypt.so are using RPATH

diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index d215552..a62853e 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,14 +1,14 @@ -From 3aef7c8034e706afa8f0b3e31ecd03c8f9017ab4 Mon Sep 17 00:00:00 2001 +From 1a419b902c5fc2d07e880fa13666fddf70100093 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Wed, 26 Jul 2017 14:30:41 -0400 Subject: [PATCH 01/22] Set Tor Messenger preferences

--- - im/app/profile/all-instantbird.js | 458 ++++++++++++++++++++++++++++++++++++-- - 1 file changed, 434 insertions(+), 24 deletions(-) + im/app/profile/all-instantbird.js | 468 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 444 insertions(+), 24 deletions(-)

diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index 127c86a662..31b3744c63 100644 +index 127c86a662..3a5f63909e 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js @@ -1,3 +1,56 @@ @@ -198,7 +198,7 @@ index 127c86a662..31b3744c63 100644

pref("chat.twitter.consumerKey", "TSuyS1ieRAkB3qWv8yyEw"); pref("chat.twitter.consumerSecret", "DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU"); -@@ -337,4 +387,364 @@ pref("chat.twitter.consumerSecret", "DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU +@@ -337,4 +387,374 @@ pref("chat.twitter.consumerSecret", "DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU pref("chat.prpls.forcePurple", "");

// Whether to parse log files for conversation statistics. @@ -420,6 +420,9 @@ index 127c86a662..31b3744c63 100644 +pref("network.protocol-handler.warn-external.news", true); +pref("network.protocol-handler.warn-external.nntp", true); +pref("network.protocol-handler.warn-external.snews", true); ++// Make sure we don't have any GIO supported protocols (defense in depth ++// measure) ++pref("network.gio.supported-protocols", ""); +pref("plugin.disable", true); // Disable to search plugins on first start +//pref("plugins.click_to_play", true); // TM +//pref("plugin.state.flash", 1); // TM @@ -504,6 +507,10 @@ index 127c86a662..31b3744c63 100644 +pref("extensions.pendingOperations", false); +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. ++pref("extensions.getAddons.showPane", false); + +// Toolbar layout +pref("browser.uiCustomization.state", "{"placements":{"PanelUI-contents":["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","https-everywhere-button","downloads-button"],"addon-bar":["addonbar-closebutton","status-bar"],"PersonalToolbar":["personal-bookmarks"],"nav-bar":["noscript-tbb","torbutton-button","urlbar-container","search-container","webrtc-status-button","loop-button"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button"],"toolbar-menubar":["menubar-items"]},"seen":[],"dirtyAreaCache":["PersonalToolbar","nav-bar","TabsToolbar","toolbar-menubar","PanelUI-contents","addon-bar"],"currentVersion":4,"newElementCount":0}"); @@ -561,9 +568,12 @@ index 127c86a662..31b3744c63 100644 +// in case the download panel got removed from the toolbar. +pref("browser.download.panel.shown", true); + ++// Treat .onions as secure ++pref("dom.securecontext.whitelist_onions", true); ++ +#ifdef TOR_BROWSER_VERSION +#expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); +#endif -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch index 8d06c52..79c7728 100644 --- a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch +++ b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch @@ -1,4 +1,4 @@ -From ab5dabcf6221b83733482587c6ccdb3975b30b46 Mon Sep 17 00:00:00 2001 +From 91062162469ca90684b78e420c8bb5e178de3b63 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Mon, 16 Nov 2015 20:37:53 -0800 Subject: [PATCH 02/22] Trac 21634: Autologin default should be false @@ -35,5 +35,5 @@ index d51df3225c..904d22ba57 100644

</wizard> -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0003-XMPP-in-band-registration.patch b/projects/instantbird/0003-XMPP-in-band-registration.patch index 5b1fd6d..68aaea8 100644 --- a/projects/instantbird/0003-XMPP-in-band-registration.patch +++ b/projects/instantbird/0003-XMPP-in-band-registration.patch @@ -1,4 +1,4 @@ -From 313ff42077e8a6aa6ca8acf9a659d991af64bdc3 Mon Sep 17 00:00:00 2001 +From 249a20eedb778a0cd3917a6c414f5c1029d84051 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Wed, 26 Jul 2017 15:09:40 -0400 Subject: [PATCH 03/22] XMPP in-band registration @@ -392,5 +392,5 @@ index 43d0f19e3f..c46fb2f956 100644 + +<!ENTITY registerXMPP.label "Create this new account on the server"> -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0004-Remove-search-from-UI.patch b/projects/instantbird/0004-Remove-search-from-UI.patch index 3459d6c..7ab2b82 100644 --- a/projects/instantbird/0004-Remove-search-from-UI.patch +++ b/projects/instantbird/0004-Remove-search-from-UI.patch @@ -1,4 +1,4 @@ -From 5b47b35c62fe57b4e37b75efd9e116d6995c0b88 Mon Sep 17 00:00:00 2001 +From bc892e8e51fb9d7a43d52f7a6a15fcbd3efee73b Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 18:47:48 -0700 Subject: [PATCH 04/22] Remove search from UI @@ -60,5 +60,5 @@ index fad67c190b..cfe2405ea3 100644 <groupbox> <caption label="&configEditDesc.label;"/> -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch index 85aca2d..f4cf2df 100644 --- a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch @@ -1,4 +1,4 @@ -From 38fa4bd0401bc9dbcba80a7fb1d51456dae0e3b1 Mon Sep 17 00:00:00 2001 +From f26c44cebb6b2b3d6300a91413b363c04fc3d74a Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Wed, 26 Jul 2017 15:46:51 -0400 Subject: [PATCH 05/22] Add Tor Messenger branding @@ -5121,5 +5121,5 @@ index 15ec569c11..4a2d35d8a1 100644 -Info=Instantbird is installing your updates and will start in a few moments… +Info=Tor Messenger is installing your updates and will start in a few moments… -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch index b69798e..6faad85 100644 --- a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch +++ b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch @@ -1,4 +1,4 @@ -From ca63ac2fee5d1cd4c07385c27951336ca044e0f1 Mon Sep 17 00:00:00 2001 +From 9ee2a5b30901e57d10faeb23a7fbea9ffc6ddbf1 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:24:09 -0700 Subject: [PATCH 06/22] Remove option for configuring account picture @@ -22,5 +22,5 @@ index 843f1eef57..71ee2c9ef8 100644 <panel id="changeUserIconPanel" type="arrow" align="center" -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0007-Modify-top-protocol-defaults.patch b/projects/instantbird/0007-Modify-top-protocol-defaults.patch index 4cf2462..c69f058 100644 --- a/projects/instantbird/0007-Modify-top-protocol-defaults.patch +++ b/projects/instantbird/0007-Modify-top-protocol-defaults.patch @@ -1,4 +1,4 @@ -From 293de6a98f59314906fb493931e4da08c145edb9 Mon Sep 17 00:00:00 2001 +From 1a168f96d38212aa4b7429abaa00954530e492cc Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Wed, 26 Jul 2017 16:16:09 -0400 Subject: [PATCH 07/22] Modify top protocol defaults @@ -21,5 +21,5 @@ index 135b68386c..356321dbcc 100644 </hbox> </wizardpage> -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0008-Modify-IRC-defaults.patch b/projects/instantbird/0008-Modify-IRC-defaults.patch index 41d227d..5ec0466 100644 --- a/projects/instantbird/0008-Modify-IRC-defaults.patch +++ b/projects/instantbird/0008-Modify-IRC-defaults.patch @@ -1,4 +1,4 @@ -From 5c4c225ebc5b63e6a4701bfa52857caf2ab0461d Mon Sep 17 00:00:00 2001 +From bd964173ba0c6cca95de9c51baec230c7e40b1fb Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:31:58 -0700 Subject: [PATCH 08/22] Modify IRC defaults @@ -61,5 +61,5 @@ index 43ed2ced4b..c2f16bee84 100644 ". Sending TIME response: "" + now + ""."); this.sendCTCPMessage(aMessage.origin, true, "TIME", ":" + now); -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch index 6ab40d6..85e32b4 100644 --- a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch +++ b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch @@ -1,4 +1,4 @@ -From 3a7c66ba02524914d909b32ce716586f775aaeca Mon Sep 17 00:00:00 2001 +From f573a42e2d1ea02776edee2ade03e63bb6388e3a Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Fri, 28 Jul 2017 12:11:57 -0400 Subject: [PATCH 09/22] Do not set default XMPP server @@ -21,5 +21,5 @@ index 2afb15f059..1d2c167d3e 100644

options: { -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0010-Modify-themes.patch b/projects/instantbird/0010-Modify-themes.patch index d12c3c5..0e2ad48 100644 --- a/projects/instantbird/0010-Modify-themes.patch +++ b/projects/instantbird/0010-Modify-themes.patch @@ -1,4 +1,4 @@ -From 466f8a545201f58e72d43bcf602251ab619fc189 Mon Sep 17 00:00:00 2001 +From efabf635d682d4eea8a3329d71df014214d247ba Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:36:38 -0700 Subject: [PATCH 10/22] Modify themes @@ -74,5 +74,5 @@ index 454e366960..18ba1f95cc 100644 <separator class="thin"/> <description>&emoticonsPreview.description;</description> -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0011-Remove-logging-UI.patch b/projects/instantbird/0011-Remove-logging-UI.patch index 33e6dc9..1f2aab4 100644 --- a/projects/instantbird/0011-Remove-logging-UI.patch +++ b/projects/instantbird/0011-Remove-logging-UI.patch @@ -1,4 +1,4 @@ -From 5951a00ada2bbc5dbf61b71ab339dc68646892fe Mon Sep 17 00:00:00 2001 +From 371b52940173e9fd2fe85ac2ca5ef9f03d371e11 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:50:48 -0700 Subject: [PATCH 11/22] Remove logging UI @@ -39,5 +39,5 @@ index 7c9db1cdd8..2d7b2701ea 100644 <groupbox id="passwordsGroup" orient="vertical"> <caption label="&passwords.label;"/> -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0012-Cert-override.patch b/projects/instantbird/0012-Cert-override.patch index fe65ceb..d4370df 100644 --- a/projects/instantbird/0012-Cert-override.patch +++ b/projects/instantbird/0012-Cert-override.patch @@ -1,4 +1,4 @@ -From 015feb4d96762ffb6705091ef2713178702dcde2 Mon Sep 17 00:00:00 2001 +From 0774d5ed349bf900a96a9e13bcf9687c7d70368f Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:56:46 -0700 Subject: [PATCH 12/22] Cert override @@ -60,5 +60,5 @@ index def78c809c..614d52bca2 100644 #ifdef XP_MACOSX @RESPATH@/components/ibDockBadge.js -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch index ffb6867..c5e42ac 100644 --- a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch @@ -1,4 +1,4 @@ -From ccb6940299d87e001b392c10d028dfc3ac5b9516 Mon Sep 17 00:00:00 2001 +From 7efeac31a408d2aa0b80597d2609897406469103 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:58:31 -0700 Subject: [PATCH 13/22] Display all traffic over Tor @@ -34,5 +34,5 @@ index c46fb2f956..6b49c84fad 100644 <!ENTITY accountProtocolShowMore.label "Show all protocols"> <!ENTITY accountProtocolShowMore.description "Choose from the full list of protocols"> -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0014-Trac-17480-Content-sink.patch b/projects/instantbird/0014-Trac-17480-Content-sink.patch index 3788ef7..5b8632d 100644 --- a/projects/instantbird/0014-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0014-Trac-17480-Content-sink.patch @@ -1,4 +1,4 @@ -From c8670c32a866081764149bf3fd6670192994d401 Mon Sep 17 00:00:00 2001 +From c69ef4b466ab631fadfad9026c574bd036eedfba Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Wed, 5 Oct 2016 11:09:25 -0700 Subject: [PATCH 14/22] Trac 17480: Content sink @@ -107,5 +107,5 @@ index 3b8ccfa2b3..ba41da76aa 100644 <menuitem value="0" label="&filterLevelNone;"/> </menupopup> -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch index 140d522..01fca27 100644 --- a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,4 +1,4 @@ -From ab0108edfd75b2f4741cf0080113887d697ddf4b Mon Sep 17 00:00:00 2001 +From 94555d7b82f8bc5cf31446c574a1abc711838368 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Sun, 2 Oct 2016 08:46:55 -0700 Subject: [PATCH 15/22] SASL ECDSA-NIST256P-CHALLENGE @@ -8915,5 +8915,5 @@ index bc25396873..e46815dfe3 100644 'ircCAP.jsm', 'ircCommands.jsm', -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch b/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch index fe55d6e..5e1b677 100644 --- a/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch +++ b/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch @@ -1,4 +1,4 @@ -From 5589e17c4747a3c30edc3e5a980f80abac92c744 Mon Sep 17 00:00:00 2001 +From e9d61cdc4d05ea2def1f270f8a7b5ea5dc520656 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Tue, 29 Aug 2017 14:45:29 -0400 Subject: [PATCH 16/22] Bug 1321641 - Use built-in functions instead of an svg @@ -53,5 +53,5 @@ index 80421b8ca2..6520757ddd 100644

.indicator { -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch b/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch index 1aee3e1..5b392f0 100644 --- a/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch +++ b/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch @@ -1,4 +1,4 @@ -From 75a58323c2964b36b0409a37249473f0ff39b803 Mon Sep 17 00:00:00 2001 +From ce279ac901dfdebc18a380a1011457f5c62f336c Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Wed, 26 Jul 2017 16:35:33 -0400 Subject: [PATCH 17/22] Bug 1321420 - Add a pref to disable JavaScript in @@ -48,5 +48,5 @@ index c52c8c637d..0069219fa6 100644 Components.interfaces.nsIWebProgress.NOTIFY_ALL); let url = request.url; -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch b/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch index 370d12e..6d709c4 100644 --- a/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch +++ b/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch @@ -1,4 +1,4 @@ -From baeb48bfa3e1185a533b3576c6c1afd653d963cf Mon Sep 17 00:00:00 2001 +From 04752e3d48bf46acf925e2d7d160803ddd44995b Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy huyvq.c633@gmail.com Date: Wed, 26 Jul 2017 16:38:19 -0400 Subject: [PATCH 18/22] Trac 17517 - Use different color for Add Exception @@ -19,5 +19,5 @@ index 807184209b..8ce7f9ad81 100644 + color: #fff; +} -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch b/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch index ea7c3d9..cd8ef86 100644 --- a/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch +++ b/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch @@ -1,4 +1,4 @@ -From 1f7835fa96fb79e580ff76508bdebe6fe294f101 Mon Sep 17 00:00:00 2001 +From ba99bf085d2243a42b3254ef6a72b0124fec89f6 Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy huyvq.c633@gmail.com Date: Sun, 2 Apr 2017 13:07:09 -0400 Subject: [PATCH 19/22] Trac 21736 - Hide account/timestamp from message @@ -44,7 +44,7 @@ index a723d742bf..95d917f0d7 100644 }

diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index 31b3744c63..98e1a7b929 100644 +index 3a5f63909e..7d7c97aa07 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js @@ -50,6 +50,11 @@ pref("extensions.systemAddon.update.url", ""); @@ -60,5 +60,5 @@ index 31b3744c63..98e1a7b929 100644 /* 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 -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch b/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch index e1f3858..d218af0 100644 --- a/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch +++ b/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch @@ -1,4 +1,4 @@ -From 6e26c435c18d09198b94ed772ff4e1840d1338b2 Mon Sep 17 00:00:00 2001 +From cb44d196feebe36434fdf433d3958835ef5358b6 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Thu, 27 Jul 2017 15:16:54 -0400 Subject: [PATCH 20/22] Update allowed duplicated files for Windows and Linux @@ -94,5 +94,5 @@ index 988dc2d35a..940418bc9d 100644 # Variants of paths in mozilla/browser/installer/allowed-dupes.mn # and mail/installer/allowed-dupes.mn: -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch index 65a90e0..4787ec3 100644 --- a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch +++ b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch @@ -1,4 +1,4 @@ -From 3420f52e84a8902eee7394e98474781fd02014ce Mon Sep 17 00:00:00 2001 +From a95405607d17f87212af5b5584e28d32cf351873 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Tue, 15 Aug 2017 16:40:33 -0400 Subject: [PATCH 21/22] Bug 13855: Use known onions for XMPP servers @@ -138,5 +138,5 @@ index efb0b77aee..05a4deb462 100644 + +onionAddress.label=%S is %S's onion address. -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch index 89bc546..3ec3165 100644 --- a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch +++ b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch @@ -1,4 +1,4 @@ -From e3150c2c9018a68b1582a2c30c7e6821ea223c64 Mon Sep 17 00:00:00 2001 +From 1c17e0cd088be7c374e4ef558482254fc9e19072 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 21 Aug 2017 23:00:07 -0400 Subject: [PATCH 22/22] Bug 16606: Automatic XMPP accounts @@ -166,5 +166,5 @@ index 6b49c84fad..de7fe8ed11 100644 <!ENTITY registerXMPP.label "Create this new account on the server"> +<!ENTITY tempXMPP.label "Create a temporary account automatically"> -- -2.14.1 +2.14.2

diff --git a/projects/instantbird/config b/projects/instantbird/config index 1d89837..2005ff9 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' hg_url: https://hg.mozilla.org/releases/comm-esr52/ -hg_hash: THUNDERBIRD_52_3_0_RELEASE +hg_hash: THUNDERBIRD_52_4_0_RELEASE filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %]"

var: diff --git a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch index 754f617..dcee63f 100644 --- a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch +++ b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch @@ -1,4 +1,4 @@ -From c0d3a7d4edcba39a098e5025271f7b7d59344304 Mon Sep 17 00:00:00 2001 +From 7c299eae2a3d81b1c48a3028ed2f16303f9c5e71 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Fri, 1 Sep 2017 17:39:04 -0400 Subject: [PATCH 1/5] Trac 19910: Prevents STARTTLS in XMPP @@ -115,5 +115,5 @@ index a21dfa4a5a11..5429637c1c3a 100644 void SetNamedPipeFD(PRFileDesc *fd) { mFD = fd; }

-- -2.14.1 +2.14.2

diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch index 23a9447..a4e21b3 100644 --- a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch +++ b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch @@ -1,4 +1,4 @@ -From 9772edfd02bf499342c3089473a807dcf47b2525 Mon Sep 17 00:00:00 2001 +From a7cfc17720295fb16c502fdbe5e368d8c7e986e5 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Thu, 6 Oct 2016 20:13:35 -0700 Subject: [PATCH 2/5] Trac 16475: Block flash too @@ -29,5 +29,5 @@ index cd1707beaf5f..d014832e0595 100644 }

-- -2.14.1 +2.14.2

diff --git a/projects/mozilla/0003-OSX-package-as-tar.bz2.patch b/projects/mozilla/0003-OSX-package-as-tar.bz2.patch index 8a9d260..5a9a877 100644 --- a/projects/mozilla/0003-OSX-package-as-tar.bz2.patch +++ b/projects/mozilla/0003-OSX-package-as-tar.bz2.patch @@ -1,4 +1,4 @@ -From 6a753441870fcaf9b1c59f373b59e2242c9f3739 Mon Sep 17 00:00:00 2001 +From 2dffef93c06fbe27a3cdb9ebd62510add4a9f870 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier boklm@torproject.org Date: Thu, 25 Jun 2015 12:18:43 +0200 Subject: [PATCH 3/5] OSX: package as tar.bz2 @@ -21,5 +21,5 @@ index 51633178226c..64584f579390 100644 ifeq (,$(filter-out WINNT, $(OS_ARCH))) MOZ_PKG_FORMAT = ZIP -- -2.14.1 +2.14.2

diff --git a/projects/mozilla/0004-Updater-fixups-for-TM.patch b/projects/mozilla/0004-Updater-fixups-for-TM.patch index ab99be9..4ab0770 100644 --- a/projects/mozilla/0004-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0004-Updater-fixups-for-TM.patch @@ -1,4 +1,4 @@ -From cfc8d680995fed12cc63633699dc28b40bb124a3 Mon Sep 17 00:00:00 2001 +From 24a757cb2d69bcf88a095bec4b2636ed7297eae1 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Fri, 1 Sep 2017 17:45:40 -0400 Subject: [PATCH 4/5] Updater fixups for TM @@ -804,5 +804,5 @@ index c45961ac54e7..23d6fbe2929a 100644 nsresult rv = GetAppRootDir(aExeFile, getter_AddRefs(appRootDir)); NS_ENSURE_SUCCESS(rv, rv); -- -2.14.1 +2.14.2

diff --git a/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch b/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch index 5e83e5a..38212fc 100644 --- a/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch +++ b/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch @@ -1,4 +1,4 @@ -From 013421c4b0d74bc94fb3b460e7d3bcc0293f9c0f Mon Sep 17 00:00:00 2001 +From 603166eaf0c7de988b52f5db9cdaa53bd6b60e0f Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Sat, 3 Dec 2016 10:01:52 -0800 Subject: [PATCH 5/5] Permit storing exceptions even w/ inPrivateBrowsingMode @@ -20,5 +20,5 @@ index 0ca24a614dca..df50701729ce 100644 + return false; // PrivateBrowsingUtils.isWindowPrivate(window); } -- -2.14.1 +2.14.2

diff --git a/projects/mozilla/config b/projects/mozilla/config index bbbf55d..915b681 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: tor-browser-52.3.0esr-7.0-1-build1 +version: tor-browser-52.4.0esr-7.0-1-build1 filename: 'mozilla-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/tor-browser.git git_hash: '[% c("version") %]' diff --git a/tor-browser-build b/tor-browser-build index fd97762..8c4c05d 160000 --- a/tor-browser-build +++ b/tor-browser-build @@ -1 +1 @@ -Subproject commit fd97762cb0924eea137896425eab788daef6ca8d +Subproject commit 8c4c05ddcfc30107b967b204d491523685460226