commit 0f6fd917d6312d8e10e44fe9b7b9fa9e2b021871 Author: Arlo Breault arlolra@gmail.com Date: Tue Mar 7 13:17:54 2017 -0800

Bump tags for 45.8.0

* tor-browser tag to tor-browser-45.8.0esr-6.5-2-build1

* comm-esr45 tag to THUNDERBIRD_45_8_0_RELEASE

* Tor Browser to 6.5.1 --- ChangeLog | 6 ++++++ projects/instantbird/0001-Set-Tor-Messenger-preferences.patch | 4 ++-- .../instantbird/0002-Trac-16489-Prevent-account-autologin.patch | 4 ++-- ...0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch | 4 ++-- ...0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch | 4 ++-- projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch | 4 ++-- ...0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch | 4 ++-- ...0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch | 4 ++-- projects/instantbird/0008-XMPP-in-band-registration.patch | 4 ++-- projects/instantbird/0009-Remove-search-from-UI.patch | 4 ++-- projects/instantbird/0010-Add-Tor-Messenger-branding.patch | 4 ++-- projects/instantbird/0011-Account-picture.patch | 4 ++-- projects/instantbird/0012-Modify-protocol-defaults.patch | 4 ++-- projects/instantbird/0013-Modify-IRC-defaults.patch | 4 ++-- projects/instantbird/0014-Modify-themes.patch | 4 ++-- projects/instantbird/0015-Modify-XMPP-defaults.patch | 4 ++-- projects/instantbird/0016-Remove-logging-UI.patch | 4 ++-- projects/instantbird/0017-Cert-override.patch | 4 ++-- projects/instantbird/0018-Display-all-traffic-over-Tor.patch | 4 ++-- projects/instantbird/0019-Trac-17480-Content-sink.patch | 4 ++-- projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch | 4 ++-- ...0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch | 4 ++-- ...0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch | 4 ++-- .../0023-Bug-1187281-Only-show-close-button-on-Windows.patch | 4 ++-- ...0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch | 4 ++-- ...0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch | 4 ++-- ...0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch | 4 ++-- projects/instantbird/config | 2 +- projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 4 ++-- projects/mozilla/0002-Trac-16475-Block-flash-too.patch | 4 ++-- ...0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch | 4 ++-- ...0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch | 4 ++-- projects/mozilla/0005-OSX-package-as-tar.bz2.patch | 4 ++-- projects/mozilla/0006-Updater-fixups-for-TM.patch | 4 ++-- ...0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch | 4 ++-- projects/mozilla/config | 2 +- projects/tor-browser/config | 2 +- rbm.conf | 2 +- tools/update-responses/config.yml | 7 ++++++- 39 files changed, 82 insertions(+), 71 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 49d94d3..67553fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tor Messenger 0.4.0b2 -- + * All Platforms + * Use the tor-browser-45.8.0esr-6.5-2-build1 tag on tor-browser + * Use the THUNDERBIRD_45_8_0_RELEASE tag on comm-esr45 + * Update tor-browser to 6.5.1 + Tor Messenger 0.4.0b1 -- March 06, 2017 * All Platforms * Use the tor-browser-45.7.0esr-6.5-1-build1 tag on tor-browser diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index c3d47cf..e86fb27 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,4 +1,4 @@ -From 3f6a583ee1ea833dbf46ebc957917993a4736946 Mon Sep 17 00:00:00 2001 +From fb5f313361c15285152d6e3f25a428e60f8d1679 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:48:41 -0700 Subject: [PATCH 01/26] Set Tor Messenger preferences @@ -521,5 +521,5 @@ index b7a397017..7b91410f9 100644 +#expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); +#endif -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch index 01dec0c..de0f39c 100644 --- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch +++ b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch @@ -1,4 +1,4 @@ -From 93d819d685fa99d607a71d370c8f45f2e99d5493 Mon Sep 17 00:00:00 2001 +From 8b87a9f3db3ce327b85bd1fcb3306ae49f3c9478 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/26] Trac 16489: Prevent account autologin @@ -117,5 +117,5 @@ index e5f7fb659..5e0024d86 100644 <caption label="&accountsMgr.label;"/>

-- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch index a8ecd56..8a92f7c 100644 --- a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch +++ b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch @@ -1,4 +1,4 @@ -From 2c8933abb0b1eec048c0205cf49729856e8c84e7 Mon Sep 17 00:00:00 2001 +From c719171fd2ec910bebc030061c4961dc79c90a46 Mon Sep 17 00:00:00 2001 From: aleth aleth@instantbird.org Date: Sat, 30 Jan 2016 20:56:38 +0100 Subject: [PATCH 03/26] Trac 17896: Support "Special Characters" input prompt @@ -74,5 +74,5 @@ index 30aeb1fc5..14fc9e8f6 100644 <keyset id="mainkeyset"/> <menubar id="blistMenubar"/> -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch index 882602d..189ab74 100644 --- a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch +++ b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch @@ -1,4 +1,4 @@ -From 71ced3fd410481505db5506ba0107cdd21438db7 Mon Sep 17 00:00:00 2001 +From c29e5366baa017fe3eb91042c91f729d9b1da0e0 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Tue, 2 Feb 2016 16:04:51 -0800 Subject: [PATCH 04/26] Trac 17494: Better error reporting for failed outgoing @@ -63,5 +63,5 @@ index 7c3fcd7e6..282575938 100644 else if (this._isMucParticipant && muc && !muc.left && error.condition == "item-not-found") { -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch index bd3d4b8..9119e39 100644 --- a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch +++ b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch @@ -1,4 +1,4 @@ -From 41c6168d9c347a34c67249cdab427736df0c3930 Mon Sep 17 00:00:00 2001 +From 85b00c12b5d2420adf77a2043c80a06ce5ca828d Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Tue, 15 Mar 2016 17:40:42 -0700 Subject: [PATCH 05/26] Trac 13312: OTR over Twitter DMs @@ -739,5 +739,5 @@ index 59f60cc22..4d8e04c02 100644 };

-- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch index c47f16d..a2f0b67 100644 --- a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch +++ b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch @@ -1,4 +1,4 @@ -From c632159066e0cdc81d7ac5b69e4d7fb1aea3922a Mon Sep 17 00:00:00 2001 +From 66f222db745b848a0ff24238218b0ca9563fe264 Mon Sep 17 00:00:00 2001 From: Nihanth Subramanya nhnt11@gmail.com Date: Sun, 9 Oct 2016 21:53:04 -0700 Subject: [PATCH 06/26] Bug 1218193 - Fix tab strip background colour on OS X. @@ -22,5 +22,5 @@ index 76c5094e3..291545039 100644 background-repeat: repeat-x; } -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch index a1a6cc9..028734d 100644 --- a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch +++ b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch @@ -1,4 +1,4 @@ -From bb331ed68d8150a72ee30734891f02e824c08a6d Mon Sep 17 00:00:00 2001 +From 172ba8233c54438d15e523e4d4c8e5864d06a65d Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Sun, 9 Oct 2016 21:57:07 -0700 Subject: [PATCH 07/26] Bug 1246431 - XMPP createConversation should handle @@ -22,5 +22,5 @@ index 282575938..71f777009 100644 throw "Invalid JID"; } -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0008-XMPP-in-band-registration.patch b/projects/instantbird/0008-XMPP-in-band-registration.patch index c617e2c..a363160 100644 --- a/projects/instantbird/0008-XMPP-in-band-registration.patch +++ b/projects/instantbird/0008-XMPP-in-band-registration.patch @@ -1,4 +1,4 @@ -From 5b90c85e4c5e3d7d49006ee299417d9ceeca62ac Mon Sep 17 00:00:00 2001 +From 72b0df30953c3e7cb52ecf01ca3d6009d558e326 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 18:42:25 -0700 Subject: [PATCH 08/26] XMPP in-band registration @@ -392,5 +392,5 @@ index 43d0f19e3..c46fb2f95 100644 + +<!ENTITY registerXMPP.label "Create this new account on the server"> -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0009-Remove-search-from-UI.patch b/projects/instantbird/0009-Remove-search-from-UI.patch index 8165fee..1761343 100644 --- a/projects/instantbird/0009-Remove-search-from-UI.patch +++ b/projects/instantbird/0009-Remove-search-from-UI.patch @@ -1,4 +1,4 @@ -From beecf3b5d4a6f682eab932640068097a297ae943 Mon Sep 17 00:00:00 2001 +From 3996cffb7e430eee24676c63901c6e9175c18131 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 18:47:48 -0700 Subject: [PATCH 09/26] Remove search from UI @@ -60,5 +60,5 @@ index fad67c190..cfe2405ea 100644 <groupbox> <caption label="&configEditDesc.label;"/> -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0010-Add-Tor-Messenger-branding.patch b/projects/instantbird/0010-Add-Tor-Messenger-branding.patch index 3ef898e..3a4d4db 100644 --- a/projects/instantbird/0010-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0010-Add-Tor-Messenger-branding.patch @@ -1,4 +1,4 @@ -From 21890c548091d7f43e89f2df1816c468f2a2cdf5 Mon Sep 17 00:00:00 2001 +From 0374dbfb3906a74d562827eb94a378c10ad7c26f Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 18:56:27 -0700 Subject: [PATCH 10/26] Add Tor Messenger branding @@ -5130,5 +5130,5 @@ index 15ec569c1..4a2d35d8a 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.11.0 +2.12.0

diff --git a/projects/instantbird/0011-Account-picture.patch b/projects/instantbird/0011-Account-picture.patch index f89bd00..a99459d 100644 --- a/projects/instantbird/0011-Account-picture.patch +++ b/projects/instantbird/0011-Account-picture.patch @@ -1,4 +1,4 @@ -From 25cc9f7781966e98788b6b5cd04e51cbdd03c962 Mon Sep 17 00:00:00 2001 +From 71fdc6505cb36968cd518bc351ca72a210c5570e Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:24:09 -0700 Subject: [PATCH 11/26] Account picture @@ -22,5 +22,5 @@ index b90fddadb..f29a48b99 100644 <panel id="changeUserIconPanel" type="arrow" align="center" -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0012-Modify-protocol-defaults.patch b/projects/instantbird/0012-Modify-protocol-defaults.patch index f18c794..1794037 100644 --- a/projects/instantbird/0012-Modify-protocol-defaults.patch +++ b/projects/instantbird/0012-Modify-protocol-defaults.patch @@ -1,4 +1,4 @@ -From 9a17214a4da6b331941d472510cee846ec112979 Mon Sep 17 00:00:00 2001 +From 26996669f40ef665317af1943ae191a131da8a64 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:25:34 -0700 Subject: [PATCH 12/26] Modify protocol defaults @@ -44,5 +44,5 @@ index d552a232b..7d371bd21 100644 topProtocol.prpl-twitter.description=Stay up to date with your Twitter timeline topProtocol.prpl-aim.description=Chat with your buddies on AOL Instant Messenger -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0013-Modify-IRC-defaults.patch b/projects/instantbird/0013-Modify-IRC-defaults.patch index 66b4cd4..fe3fded 100644 --- a/projects/instantbird/0013-Modify-IRC-defaults.patch +++ b/projects/instantbird/0013-Modify-IRC-defaults.patch @@ -1,4 +1,4 @@ -From 08da489af04a8077148865d4671e88e01162a413 Mon Sep 17 00:00:00 2001 +From f325d825f3193abd400864d6b7878f92ff3e6083 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:31:58 -0700 Subject: [PATCH 13/26] Modify IRC defaults @@ -61,5 +61,5 @@ index 28eb374f4..120be10ee 100644 ". Sending TIME response: "" + now + ""."); this.sendCTCPMessage(aMessage.origin, true, "TIME", ":" + now); -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0014-Modify-themes.patch b/projects/instantbird/0014-Modify-themes.patch index 25594e8..67e94dd 100644 --- a/projects/instantbird/0014-Modify-themes.patch +++ b/projects/instantbird/0014-Modify-themes.patch @@ -1,4 +1,4 @@ -From d65e732c91cb71fa6383ac314a5544b4045e9a01 Mon Sep 17 00:00:00 2001 +From b2636f3e3d067947ac37b01cfe89fd481ffb5992 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:36:38 -0700 Subject: [PATCH 14/26] Modify themes @@ -74,5 +74,5 @@ index 454e36696..18ba1f95c 100644 <separator class="thin"/> <description>&emoticonsPreview.description;</description> -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0015-Modify-XMPP-defaults.patch b/projects/instantbird/0015-Modify-XMPP-defaults.patch index 039d9a3..aab6a4d 100644 --- a/projects/instantbird/0015-Modify-XMPP-defaults.patch +++ b/projects/instantbird/0015-Modify-XMPP-defaults.patch @@ -1,4 +1,4 @@ -From 0ee19d29c6d38d5f945ec65e60c42f2f86bb679b Mon Sep 17 00:00:00 2001 +From 354cc159f590b52487356b9f8a78680b098c6fdd Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:38:49 -0700 Subject: [PATCH 15/26] Modify XMPP defaults @@ -44,5 +44,5 @@ index 265445a18..a5635cae3 100644 connection_security: { get label() { return _("options.connectionSecurity"); }, -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0016-Remove-logging-UI.patch b/projects/instantbird/0016-Remove-logging-UI.patch index e547d03..9770c0a 100644 --- a/projects/instantbird/0016-Remove-logging-UI.patch +++ b/projects/instantbird/0016-Remove-logging-UI.patch @@ -1,4 +1,4 @@ -From 1486a399e93f612eb41a2ce3a54d6642ec940c8f Mon Sep 17 00:00:00 2001 +From 6cf79bd3bd255f6020ff00e62a1f38509d46dfa0 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:50:48 -0700 Subject: [PATCH 16/26] Remove logging UI @@ -39,5 +39,5 @@ index 7c9db1cdd..2d7b2701e 100644 <groupbox id="passwordsGroup" orient="vertical"> <caption label="&passwords.label;"/> -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0017-Cert-override.patch b/projects/instantbird/0017-Cert-override.patch index 2a8de75..5a3d403 100644 --- a/projects/instantbird/0017-Cert-override.patch +++ b/projects/instantbird/0017-Cert-override.patch @@ -1,4 +1,4 @@ -From ef9f118d22410cc5d051740a83f774387c4bbf8d Mon Sep 17 00:00:00 2001 +From f7137b50efc2d533e08e1829af173c68d30b7878 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:56:46 -0700 Subject: [PATCH 17/26] Cert override @@ -60,5 +60,5 @@ index 1174b3dfd..3e35a2e1b 100644 #ifdef XP_MACOSX @RESPATH@/components/ibDockBadge.js -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0018-Display-all-traffic-over-Tor.patch b/projects/instantbird/0018-Display-all-traffic-over-Tor.patch index 4b38188..ab82e0b 100644 --- a/projects/instantbird/0018-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0018-Display-all-traffic-over-Tor.patch @@ -1,4 +1,4 @@ -From a8afc6259faa65ef53b61ece6c4f954c5c0f89b1 Mon Sep 17 00:00:00 2001 +From 56a3cfefb45ab3b7d26d64c6d2738674c824555d Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:58:31 -0700 Subject: [PATCH 18/26] Display all traffic over Tor @@ -34,5 +34,5 @@ index c46fb2f95..6b49c84fa 100644 <!ENTITY accountProtocolShowMore.label "Show all protocols"> <!ENTITY accountProtocolShowMore.description "Choose from the full list of protocols"> -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0019-Trac-17480-Content-sink.patch b/projects/instantbird/0019-Trac-17480-Content-sink.patch index f08a374..8d187bc 100644 --- a/projects/instantbird/0019-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0019-Trac-17480-Content-sink.patch @@ -1,4 +1,4 @@ -From 4cbffef65c77ae2fa4ecf480a5b38c79200a898f Mon Sep 17 00:00:00 2001 +From 6224bb7a78370452761f28c4842f4de156af298f Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Wed, 5 Oct 2016 11:09:25 -0700 Subject: [PATCH 19/26] Trac 17480: Content sink @@ -107,5 +107,5 @@ index 3b8ccfa2b..ba41da76a 100644 <menuitem value="0" label="&filterLevelNone;"/> </menupopup> -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch index 385a63d..9a66360 100644 --- a/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,4 +1,4 @@ -From e5d30254bb7da7ac6286b8f3e5f062072c170d9d Mon Sep 17 00:00:00 2001 +From 6ae664ad609f5a10929d40af5ddfff8ae9d30a69 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Sun, 2 Oct 2016 08:46:55 -0700 Subject: [PATCH 20/26] SASL ECDSA-NIST256P-CHALLENGE @@ -8915,5 +8915,5 @@ index bc2539687..e46815dfe 100644 'ircCAP.jsm', 'ircCommands.jsm', -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch b/projects/instantbird/0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch index 7ba6a0d..ea06316 100644 --- a/projects/instantbird/0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch +++ b/projects/instantbird/0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch @@ -1,4 +1,4 @@ -From f11d397c27deb2f34b069e4c6c952793fc67657c Mon Sep 17 00:00:00 2001 +From d7f5e0ae90ce980566466a2bab1556f606320843 Mon Sep 17 00:00:00 2001 From: aleth aleth@instantbird.org Date: Wed, 26 Oct 2016 20:16:58 +0200 Subject: [PATCH 21/26] Bug 1313137 - "msg is not defined" error in @@ -25,5 +25,5 @@ index c2167a5ec..b58c2c2eb 100644 },

-- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch b/projects/instantbird/0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch index 6fa776c..7cc420e 100644 --- a/projects/instantbird/0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch +++ b/projects/instantbird/0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch @@ -1,4 +1,4 @@ -From 10c0e491625782ea5c2a99bfacbafa8a65406094 Mon Sep 17 00:00:00 2001 +From d10d5ffbb0bb535e2776d77fd51cbb0c26890fcc Mon Sep 17 00:00:00 2001 From: aleth aleth@instantbird.org Date: Thu, 12 May 2016 15:10:43 +0200 Subject: [PATCH 22/26] Bug 954368 - Contact list entries should adapt their @@ -318,5 +318,5 @@ index 992267405..c033b51bc 100644 min-width: 16px; } -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0023-Bug-1187281-Only-show-close-button-on-Windows.patch b/projects/instantbird/0023-Bug-1187281-Only-show-close-button-on-Windows.patch index 15fb272..de44447 100644 --- a/projects/instantbird/0023-Bug-1187281-Only-show-close-button-on-Windows.patch +++ b/projects/instantbird/0023-Bug-1187281-Only-show-close-button-on-Windows.patch @@ -1,4 +1,4 @@ -From df5943c2501769059a5ada93a5352f27f99f764b Mon Sep 17 00:00:00 2001 +From df663502bb3f128fbb560f8d027a68ada6ba52cf Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Sat, 5 Nov 2016 14:55:20 -0700 Subject: [PATCH 23/26] Bug 1187281 - Only show "close" button on Windows @@ -21,5 +21,5 @@ index f3f1c6bbb..d683562cb 100644 </windowdragbox> </window> -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch b/projects/instantbird/0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch index 0a5fbb4..333eade 100644 --- a/projects/instantbird/0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch +++ b/projects/instantbird/0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch @@ -1,4 +1,4 @@ -From 300fcb344de6111a6f96ebda90fe8f70a8534e00 Mon Sep 17 00:00:00 2001 +From 7f4e87091ebfc9728d8655dd5a9b6b8f646a2357 Mon Sep 17 00:00:00 2001 From: Patrick Cloke clokep@gmail.com Date: Wed, 9 Nov 2016 09:03:49 -0800 Subject: [PATCH 24/26] Bug 1316000 - Remove old Yahoo! Messenger support. @@ -2394,5 +2394,5 @@ index 16c665ab4..a4b9fc638 100644 if ("color" in style) styleAttributes += " color="" + style.color + """; -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch b/projects/instantbird/0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch index 0a7172b..fa83e6c 100644 --- a/projects/instantbird/0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch +++ b/projects/instantbird/0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch @@ -1,4 +1,4 @@ -From 4b7b7f09dab1b90af3073304d8bcfa529ac1183b Mon Sep 17 00:00:00 2001 +From 5f5f16fa1b41dd7a35ad1da327a52c3467f3ed47 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Thu, 1 Dec 2016 13:25:42 -0800 Subject: [PATCH 25/26] Bug 1321641 - Use built-in functions instead of an svg @@ -53,5 +53,5 @@ index 15ba97346..4488c30bb 100644

.indicator { -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch b/projects/instantbird/0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch index 2f6a82e..b8800a3 100644 --- a/projects/instantbird/0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch +++ b/projects/instantbird/0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch @@ -1,4 +1,4 @@ -From f076a0ffdaa9b69dad2c04b706f5a8daf8e8314d Mon Sep 17 00:00:00 2001 +From dce889af9ec054849a5483561a2d20df002ceaaa Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Thu, 1 Dec 2016 14:34:51 -0800 Subject: [PATCH 26/26] Bug 1321420 - Add a pref to disable JavaScript in @@ -48,5 +48,5 @@ index c52c8c637..0069219fa 100644 Components.interfaces.nsIWebProgress.NOTIFY_ALL); let url = request.url; -- -2.11.0 +2.12.0

diff --git a/projects/instantbird/config b/projects/instantbird/config index 1f3ecae..0a481c1 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-esr45/ -hg_hash: THUNDERBIRD_45_7_0_RELEASE +hg_hash: THUNDERBIRD_45_8_0_RELEASE filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %]" remote_docker: 1 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 d107480..bd10b77 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 8b9d71382cdf988c17dc20c38d2f9062a0643748 Mon Sep 17 00:00:00 2001 +From d7324cb7d256053d8fee8640db6735e2637c8a44 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Mon, 10 Oct 2016 10:52:52 -0700 Subject: [PATCH 1/7] Trac 19910: Prevents STARTTLS in XMPP @@ -116,5 +116,5 @@ index 568c700e2bae..1793001df2c9 100644

private: -- -2.11.0 +2.12.0

diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch index cef65eb..a8390b3 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 37767eb8aaaa39fec605b9c636a9e529af84901a Mon Sep 17 00:00:00 2001 +From f63790c8c4fc4df231845ce88ece94740c6db0c1 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/7] Trac 16475: Block flash too @@ -29,5 +29,5 @@ index 5345ce7c8764..15692365ee63 100644 }

-- -2.11.0 +2.12.0

diff --git a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch index 2e42dc3..b432fc0 100644 --- a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch +++ b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch @@ -1,4 +1,4 @@ -From 7faec6186979e8d6dca736f27949db09d07b0056 Mon Sep 17 00:00:00 2001 +From cdb8439f55dd55d9c7d9bf4787d3fff2be39578b Mon Sep 17 00:00:00 2001 From: Jonathan Kew jkew@mozilla.com Date: Sun, 9 Oct 2016 09:18:37 -0700 Subject: [PATCH 3/7] Trac 20206: Avoid the need to download the font Osaka @@ -61,5 +61,5 @@ index e3d98b13c6de..fc8ca9d14656 100644 // optimization hint for fonts with localized names to be read in at startup, otherwise read in at lookup miss // names are canonical family names (typically English names) -- -2.11.0 +2.12.0

diff --git a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch index d2c084a..0b6e851 100644 --- a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch +++ b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch @@ -1,4 +1,4 @@ -From 527afa8ed730a3287b0ae13f8e48acacb7addc4d Mon Sep 17 00:00:00 2001 +From e3d76abbb2c87689671f8cf0c685f847afa62c2b Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Wed, 23 Mar 2016 19:52:07 -0700 Subject: [PATCH 4/7] Trac 18331: Update OS X toolchain to work with ESR 45 @@ -119,5 +119,5 @@ index 0e4d118523c8..e0ad0d3c0365 100644 /* * gcc atomic ops. These are available on several other compilers as well. -- -2.11.0 +2.12.0

diff --git a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch index ce2fbb1..003e5ff 100644 --- a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch +++ b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch @@ -1,4 +1,4 @@ -From 9ba71cc32503f29cfb07204ffcdd2c2703ed0e92 Mon Sep 17 00:00:00 2001 +From a8b8203b05477cea7b1102726a8cc581512c22e8 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier boklm@torproject.org Date: Thu, 25 Jun 2015 12:18:43 +0200 Subject: [PATCH 5/7] OSX: package as tar.bz2 @@ -21,5 +21,5 @@ index 5c11ed2ef2ec..0c7bf282baab 100644 ifeq (,$(filter-out WINNT, $(OS_ARCH))) MOZ_PKG_FORMAT = ZIP -- -2.11.0 +2.12.0

diff --git a/projects/mozilla/0006-Updater-fixups-for-TM.patch b/projects/mozilla/0006-Updater-fixups-for-TM.patch index 8a413fd..665486e 100644 --- a/projects/mozilla/0006-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0006-Updater-fixups-for-TM.patch @@ -1,4 +1,4 @@ -From 102bcac5d81791ced5f245d4cbb6c8a13c10c5a2 Mon Sep 17 00:00:00 2001 +From 7a39e91c507ae3655ee8ef2dfe919b9bb409dc9a Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Sun, 9 Oct 2016 09:34:38 -0700 Subject: [PATCH 6/7] Updater fixups for TM @@ -803,5 +803,5 @@ index c45961ac54e7..23d6fbe2929a 100644 nsresult rv = GetAppRootDir(aExeFile, getter_AddRefs(appRootDir)); NS_ENSURE_SUCCESS(rv, rv); -- -2.11.0 +2.12.0

diff --git a/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch b/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch index 5c9c443..a866f76 100644 --- a/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch +++ b/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch @@ -1,4 +1,4 @@ -From 20c5a6360e15709ca1d7d053fea164a115cbc59e Mon Sep 17 00:00:00 2001 +From cdbfa65631576f1d5076cf2011f4d44810040730 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Sat, 3 Dec 2016 10:01:52 -0800 Subject: [PATCH 7/7] Permit storing exceptions even w/ inPrivateBrowsingMode @@ -20,5 +20,5 @@ index 640791f898fc..a8abfe9886c4 100644 + return false; // PrivateBrowsingUtils.isWindowPrivate(window); } -- -2.11.0 +2.12.0

diff --git a/projects/mozilla/config b/projects/mozilla/config index a948ce4..519276f 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: tor-browser-45.7.0esr-6.5-1-build1 +version: tor-browser-45.8.0esr-6.5-2-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/projects/tor-browser/config b/projects/tor-browser/config index 6e6174c..136178c 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 6.5 +version: 6.5.1 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]'

input_files: diff --git a/rbm.conf b/rbm.conf index 1d41b47..b3666fd 100644 --- a/rbm.conf +++ b/rbm.conf @@ -6,7 +6,7 @@ output_dir: "out/[% project %]" pkg_type: build

var: - tormessenger_version: '0.4.0b1' + tormessenger_version: '0.4.0b2' copyright_year: '2016' build_id: '[% sha256(c("var/build_id_txt")).substr(0, 6) %]' build_id_txt: | diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index d4e5e6f..c16a742 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -18,7 +18,7 @@ build_targets: - WINNT_x86-gcc3-x64 osx64: Darwin_x86_64-gcc3 channels: - release: 0.4.0b1 + release: 0.4.0b2 versions: 0.3.0b1: platformVersion: 45.5.0 @@ -35,3 +35,8 @@ versions: detailsURL: https://blog.torproject.org/blog/tor-messenger-040b1-released incremental_from: - 0.3.0b2 + 0.4.0b2: + platformVersion: 45.8.0 + detailsURL: https://blog.torproject.org/blog/tor-messenger-040b2-released + incremental_from: + - 0.4.0b1