[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [tor-messenger-build/master] Use THUNDERBIRD_45_6_0_RELEASE in comm-esr45



commit 54999f8cdb529af3704d460a318adbfcab6e8fbf
Author: Arlo Breault <arlolra@xxxxxxxxx>
Date:   Thu Dec 15 19:34:15 2016 -0800

    Use THUNDERBIRD_45_6_0_RELEASE in comm-esr45
    
     * Also, set app.update.download.backgroundInterval to 60 as in TB/FF.
---
 ChangeLog                                          |  2 +-
 .../0001-Set-Tor-Messenger-preferences.patch       | 30 ++++++++++++----------
 ...0002-Trac-16489-Prevent-account-autologin.patch |  2 +-
 ...Support-Special-Characters-input-prompt-o.patch |  2 +-
 ...Better-error-reporting-for-failed-outgoin.patch |  2 +-
 .../0005-Trac-13312-OTR-over-Twitter-DMs.patch     |  2 +-
 ...-Fix-tab-strip-background-colour-on-OS-X..patch |  2 +-
 ...-XMPP-createConversation-should-handle-in.patch |  2 +-
 ...-Set-_userVCard-own-property-when-downloa.patch |  2 +-
 .../0009-XMPP-in-band-registration.patch           |  2 +-
 .../instantbird/0010-Remove-search-from-UI.patch   |  2 +-
 .../0011-Add-Tor-Messenger-branding.patch          |  2 +-
 projects/instantbird/0012-Account-picture.patch    |  2 +-
 .../0013-Modify-protocol-defaults.patch            |  2 +-
 .../instantbird/0014-Modify-IRC-defaults.patch     |  2 +-
 projects/instantbird/0015-Modify-themes.patch      |  2 +-
 .../instantbird/0016-Modify-XMPP-defaults.patch    |  2 +-
 projects/instantbird/0017-Remove-logging-UI.patch  |  2 +-
 projects/instantbird/0018-Cert-override.patch      |  2 +-
 .../0019-Display-all-traffic-over-Tor.patch        |  2 +-
 .../instantbird/0020-Trac-17480-Content-sink.patch |  2 +-
 .../0021-SASL-ECDSA-NIST256P-CHALLENGE.patch       |  2 +-
 ...-msg-is-not-defined-error-in-irc.js-chang.patch |  2 +-
 ...Contact-list-entries-should-adapt-their-h.patch |  2 +-
 ...1187281-Only-show-close-button-on-Windows.patch |  2 +-
 ...-Remove-old-Yahoo-Messenger-support.-r-al.patch |  2 +-
 ...-Use-built-in-functions-instead-of-an-svg.patch |  2 +-
 ...-Add-a-pref-to-disable-JavaScript-in-brow.patch |  2 +-
 projects/instantbird/config                        |  2 +-
 29 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b219b80..d7f714b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 Tor Messenger 0.3.0b2 --
  * All Platforms
    * Use the tor-browser-45.6.0esr-6.0-1-build1 tag on tor-browser
-   * Use the THUNDERBIRD_45_5_1_RELEASE tag on comm-esr45
+   * Use the THUNDERBIRD_45_6_0_RELEASE tag on comm-esr45
    * Update ctypes-otr to 0.0.4
    * Update tor-browser to 6.0.8
    * Don't allow javascript: links in themes
diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
index f1fe704..4843fbb 100644
--- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
+++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
@@ -1,17 +1,17 @@
-From 0e21b50aaf1fe5931e1d82fbe9bb482f5449ccd1 Mon Sep 17 00:00:00 2001
+From 5f249d152ab95c0a71ff80cbb4c6b8d6acca2154 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Mon, 10 Oct 2016 19:48:41 -0700
 Subject: [PATCH 01/27] Set Tor Messenger preferences
 
 ---
- im/app/profile/all-instantbird.js | 423 ++++++++++++++++++++++++++++++++++++--
- 1 file changed, 401 insertions(+), 22 deletions(-)
+ im/app/profile/all-instantbird.js | 427 ++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 405 insertions(+), 22 deletions(-)
 
 diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js
-index b7a397017..b18e98e7f 100644
+index b7a397017..45a6bec79 100644
 --- a/im/app/profile/all-instantbird.js
 +++ b/im/app/profile/all-instantbird.js
-@@ -1,3 +1,50 @@
+@@ -1,3 +1,54 @@
 +/**
 + * This file is divded into three section,
 + *
@@ -57,12 +57,16 @@ index b7a397017..b18e98e7f 100644
 +// This pref is taken from the TB diff of browser/app/profile/firefox.js
 +pref("extensions.systemAddon.update.url", "");
 +
++// The time interval between the downloading of mar file chunks in the
++// background (in seconds)
++pref("app.update.download.backgroundInterval", 60);
++
 +
 +
  /* 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
   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-@@ -28,7 +75,7 @@ pref("general.autoScroll", true);
+@@ -28,7 +79,7 @@ pref("general.autoScroll", true);
  // 0 = spellcheck nothing
  // 1 = check multi-line controls [default]
  // 2 = check multi/single line controls
@@ -71,7 +75,7 @@ index b7a397017..b18e98e7f 100644
  
  pref("messenger.accounts.convertOldPasswords", true);
  pref("messenger.accounts.promptOnDelete", true);
-@@ -66,7 +113,7 @@ pref("extensions.mintrayr.singleClickRestore", false);
+@@ -66,7 +117,7 @@ pref("extensions.mintrayr.singleClickRestore", false);
  
  // Whether message related sounds should be played at all. If this is enabled
  // then the more specific prefs are checked as well.
@@ -80,7 +84,7 @@ index b7a397017..b18e98e7f 100644
  // Specifies whether each message event should trigger a sound for incoming
  // and outgoing messages, or when your nickname is mentioned in a chat.
  pref("messenger.options.playSounds.outgoing", true);
-@@ -142,26 +189,23 @@ pref("app.update.staging.enabled", true);
+@@ -142,26 +193,23 @@ pref("app.update.staging.enabled", true);
  
  // Update service URL:
  // You do not need to use all the %VAR% parameters. Use what you need, %PRODUCT%,%VERSION%,%BUILD_ID%,%CHANNEL% for example
@@ -112,7 +116,7 @@ index b7a397017..b18e98e7f 100644
  
  // Interval: Time before prompting the user to restart to install the latest
  //           download (in seconds) default=30 minutes
-@@ -202,7 +246,7 @@ pref("browser.search.order.1",                "chrome://instantbird/locale/regio
+@@ -202,7 +250,7 @@ pref("browser.search.order.1",                "chrome://instantbird/locale/regio
  pref("browser.search.order.2",                "chrome://instantbird/locale/region.properties");
  
  // send ping to the server to update
@@ -121,7 +125,7 @@ index b7a397017..b18e98e7f 100644
  
  // disable logging for the search service update system by default
  pref("browser.search.update.log", false);
-@@ -222,10 +266,10 @@ pref("extensions.ignoreMTimeChanges", false);
+@@ -222,10 +270,10 @@ pref("extensions.ignoreMTimeChanges", false);
  pref("extensions.logging.enabled", false);
  pref("general.skins.selectedSkin", "classic/1.0");
  
@@ -134,7 +138,7 @@ index b7a397017..b18e98e7f 100644
  
  // Preferences for the Get Add-ons pane
  pref("extensions.getAddons.cache.enabled", false);
-@@ -244,10 +288,24 @@ pref("extensions.getMoreMessageStylesURL", "https://add-ons.instantbird.org/%LOC
+@@ -244,10 +292,24 @@ pref("extensions.getMoreMessageStylesURL", "https://add-ons.instantbird.org/%LOC
  pref("extensions.getMoreEmoticonsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/emoticons/";);
  pref("extensions.getMoreProtocolsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/protocols/";);
  
@@ -162,7 +166,7 @@ index b7a397017..b18e98e7f 100644
  
  // don't load links inside Instantbird
  pref("network.protocol-handler.expose-all", false);
-@@ -259,13 +317,13 @@ pref("network.protocol-handler.expose.https", true);
+@@ -259,13 +321,13 @@ pref("network.protocol-handler.expose.https", true);
  
  // expose javascript: so that message themes can use it.
  // javascript: links inside messages are filtered out.
@@ -179,7 +183,7 @@ index b7a397017..b18e98e7f 100644
  
  // We have an Error Console menu item by default so let's display chrome errors
  pref("javascript.options.showInConsole", true);
-@@ -300,14 +358,335 @@ pref("browser.tabs.tabClipWidth", 140);
+@@ -300,14 +362,335 @@ pref("browser.tabs.tabClipWidth", 140);
  // 3  at the end of the tabstrip
  pref("browser.tabs.closeButtons", 1);
  
diff --git a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
index 27c53cd..42676ec 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 727612a3c5919be6e57c34ff064e9d047d052386 Mon Sep 17 00:00:00 2001
+From 2097122d0d75213f13a2b69c45f4c1e91ea8264d Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra@xxxxxxxxx>
 Date: Mon, 16 Nov 2015 20:37:53 -0800
 Subject: [PATCH 02/27] Trac 16489: Prevent account autologin
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 be5b62b..494672e 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 14c9615c0b5c95c824b3ecbe1323d33849ff1690 Mon Sep 17 00:00:00 2001
+From 9156c76d9d9632392b2cc6069d5606525b0bf933 Mon Sep 17 00:00:00 2001
 From: aleth <aleth@xxxxxxxxxxxxxxx>
 Date: Sat, 30 Jan 2016 20:56:38 +0100
 Subject: [PATCH 03/27] Trac 17896: Support "Special Characters" input prompt
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 fe4feb5..4138a9f 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 8810e6c3a0bfcc31b226c1404cfd2c880c1c1c34 Mon Sep 17 00:00:00 2001
+From 266389c24e1e4eb65f0c40abe414d4b4471992d3 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra@xxxxxxxxx>
 Date: Tue, 2 Feb 2016 16:04:51 -0800
 Subject: [PATCH 04/27] Trac 17494: Better error reporting for failed outgoing
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 1254069..e7c829f 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 c02d910d93b7ba9ccc2611ebea5d14ca75e23c47 Mon Sep 17 00:00:00 2001
+From 298868aee8d58055e6e210a922cf55beec70db4f Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra@xxxxxxxxx>
 Date: Tue, 15 Mar 2016 17:40:42 -0700
 Subject: [PATCH 05/27] Trac 13312: OTR over Twitter DMs
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 d3ad306..2391576 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 af6669624ad0a3f581b4e60819d8a814dea1e96e Mon Sep 17 00:00:00 2001
+From 6372d7ec1de855dd5ce01c732412e4882651e83b Mon Sep 17 00:00:00 2001
 From: Nihanth Subramanya <nhnt11@xxxxxxxxx>
 Date: Sun, 9 Oct 2016 21:53:04 -0700
 Subject: [PATCH 06/27] Bug 1218193 - Fix tab strip background colour on OS X.
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 6dfcab0..691159a 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 906d903b83bd1304f2507809c78b6e8a01618db7 Mon Sep 17 00:00:00 2001
+From 47cb0f9b3ca87aea8dcaf0e578f4fbeab6efb9c9 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra@xxxxxxxxx>
 Date: Sun, 9 Oct 2016 21:57:07 -0700
 Subject: [PATCH 07/27] Bug 1246431 - XMPP createConversation should handle
diff --git a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch
index 2709721..ecdefbe 100644
--- a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch
+++ b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch
@@ -1,4 +1,4 @@
-From 46e98074c3e4f0f82452547cf34ea5790182b9ab Mon Sep 17 00:00:00 2001
+From 834f9254f3d0eb39c26c430fcefb6f661f2bc2e9 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra@xxxxxxxxx>
 Date: Sun, 28 Aug 2016 08:57:41 -0700
 Subject: [PATCH 08/27] Bug 1298574 - Set _userVCard own property when
diff --git a/projects/instantbird/0009-XMPP-in-band-registration.patch b/projects/instantbird/0009-XMPP-in-band-registration.patch
index acbb3f6..c1a3b5b 100644
--- a/projects/instantbird/0009-XMPP-in-band-registration.patch
+++ b/projects/instantbird/0009-XMPP-in-band-registration.patch
@@ -1,4 +1,4 @@
-From 32840337a82ae03003a249179ac14d963245156f Mon Sep 17 00:00:00 2001
+From 8ecb2062a225865364f01b702da30d2578931b9e Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Mon, 10 Oct 2016 18:42:25 -0700
 Subject: [PATCH 09/27] XMPP in-band registration
diff --git a/projects/instantbird/0010-Remove-search-from-UI.patch b/projects/instantbird/0010-Remove-search-from-UI.patch
index 8c734d5..dd777d6 100644
--- a/projects/instantbird/0010-Remove-search-from-UI.patch
+++ b/projects/instantbird/0010-Remove-search-from-UI.patch
@@ -1,4 +1,4 @@
-From 93f125d61a384b1693aee15a60f6e11964f5abcb Mon Sep 17 00:00:00 2001
+From bf059fabc88ff728d65d226fb6cb158e0d8e3759 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Mon, 10 Oct 2016 18:47:48 -0700
 Subject: [PATCH 10/27] Remove search from UI
diff --git a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch
index 973adad..bc2056e 100644
--- a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch
+++ b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch
@@ -1,4 +1,4 @@
-From 388606395c2dcf2b2513b17e1abea45c661f44b5 Mon Sep 17 00:00:00 2001
+From 72f56373a20dd93e1976dd953e9a9c77076b7275 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Mon, 10 Oct 2016 18:56:27 -0700
 Subject: [PATCH 11/27] Add Tor Messenger branding
diff --git a/projects/instantbird/0012-Account-picture.patch b/projects/instantbird/0012-Account-picture.patch
index d46a804..1205946 100644
--- a/projects/instantbird/0012-Account-picture.patch
+++ b/projects/instantbird/0012-Account-picture.patch
@@ -1,4 +1,4 @@
-From 8770c4d143855951b8eedc90b8188c3a2f401f2e Mon Sep 17 00:00:00 2001
+From 4247688327fc2d92c05197bfc8f7a0877c8b31a4 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Mon, 10 Oct 2016 19:24:09 -0700
 Subject: [PATCH 12/27] Account picture
diff --git a/projects/instantbird/0013-Modify-protocol-defaults.patch b/projects/instantbird/0013-Modify-protocol-defaults.patch
index d226c82..f4a4bf4 100644
--- a/projects/instantbird/0013-Modify-protocol-defaults.patch
+++ b/projects/instantbird/0013-Modify-protocol-defaults.patch
@@ -1,4 +1,4 @@
-From 6b5c348d5d4de54db3cbfc8f68acbc7e351ac836 Mon Sep 17 00:00:00 2001
+From e5e4d83560b705e54b64c547b3d0159e559c4c92 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Mon, 10 Oct 2016 19:25:34 -0700
 Subject: [PATCH 13/27] Modify protocol defaults
diff --git a/projects/instantbird/0014-Modify-IRC-defaults.patch b/projects/instantbird/0014-Modify-IRC-defaults.patch
index 11bf85d..96cedfb 100644
--- a/projects/instantbird/0014-Modify-IRC-defaults.patch
+++ b/projects/instantbird/0014-Modify-IRC-defaults.patch
@@ -1,4 +1,4 @@
-From 1546228595bfc1b7127d7c4d9327a30c90e8f080 Mon Sep 17 00:00:00 2001
+From 469c5845459bd9427c0020cb616e1ef4e26ac4c3 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Mon, 10 Oct 2016 19:31:58 -0700
 Subject: [PATCH 14/27] Modify IRC defaults
diff --git a/projects/instantbird/0015-Modify-themes.patch b/projects/instantbird/0015-Modify-themes.patch
index bc91e46..5edd9be 100644
--- a/projects/instantbird/0015-Modify-themes.patch
+++ b/projects/instantbird/0015-Modify-themes.patch
@@ -1,4 +1,4 @@
-From 6529649b4c2dcf440970552b62d999656aabdb72 Mon Sep 17 00:00:00 2001
+From 0b72c7881c1dfc220fd3b8be2a502b34c4763c15 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Mon, 10 Oct 2016 19:36:38 -0700
 Subject: [PATCH 15/27] Modify themes
diff --git a/projects/instantbird/0016-Modify-XMPP-defaults.patch b/projects/instantbird/0016-Modify-XMPP-defaults.patch
index e141d2f..9f1a760 100644
--- a/projects/instantbird/0016-Modify-XMPP-defaults.patch
+++ b/projects/instantbird/0016-Modify-XMPP-defaults.patch
@@ -1,4 +1,4 @@
-From 8b1f0d8dfbc4483dc566269974ba85a50d6f4f21 Mon Sep 17 00:00:00 2001
+From 365390f7a795255a6d5c8f1a4e27f44f9b24aeb8 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Mon, 10 Oct 2016 19:38:49 -0700
 Subject: [PATCH 16/27] Modify XMPP defaults
diff --git a/projects/instantbird/0017-Remove-logging-UI.patch b/projects/instantbird/0017-Remove-logging-UI.patch
index 2305fc8..481fd27 100644
--- a/projects/instantbird/0017-Remove-logging-UI.patch
+++ b/projects/instantbird/0017-Remove-logging-UI.patch
@@ -1,4 +1,4 @@
-From aad7c7e9e29750bfcb9ecb9b0b0072a2d47525bd Mon Sep 17 00:00:00 2001
+From b7da961febb3d93eb7a056394f61683ba64d3b1c Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Mon, 10 Oct 2016 19:50:48 -0700
 Subject: [PATCH 17/27] Remove logging UI
diff --git a/projects/instantbird/0018-Cert-override.patch b/projects/instantbird/0018-Cert-override.patch
index 71609dd..63155f0 100644
--- a/projects/instantbird/0018-Cert-override.patch
+++ b/projects/instantbird/0018-Cert-override.patch
@@ -1,4 +1,4 @@
-From 76f4eef0da58e7bfc521108b89657bbc03c7c8ac Mon Sep 17 00:00:00 2001
+From aebafcab4731aaf8aad4d36ee08b1f205af8e449 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Mon, 10 Oct 2016 19:56:46 -0700
 Subject: [PATCH 18/27] Cert override
diff --git a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch
index f7dcf4b..8eeda8f 100644
--- a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch
+++ b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch
@@ -1,4 +1,4 @@
-From 9d12cc1475c703b56fef75b4b9760047fc4abf6d Mon Sep 17 00:00:00 2001
+From 1bdd9493ad25fbaf63afdd6d26dd3f43a169932a Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Mon, 10 Oct 2016 19:58:31 -0700
 Subject: [PATCH 19/27] Display all traffic over Tor
diff --git a/projects/instantbird/0020-Trac-17480-Content-sink.patch b/projects/instantbird/0020-Trac-17480-Content-sink.patch
index 9940f2d..08c3b6b 100644
--- a/projects/instantbird/0020-Trac-17480-Content-sink.patch
+++ b/projects/instantbird/0020-Trac-17480-Content-sink.patch
@@ -1,4 +1,4 @@
-From 53c2abceb1182a49395b2cd9b3c3ccfdcebbc5a8 Mon Sep 17 00:00:00 2001
+From 23de5560f17e825ff1c1f9595c8ac92eca45017d Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra@xxxxxxxxx>
 Date: Wed, 5 Oct 2016 11:09:25 -0700
 Subject: [PATCH 20/27] Trac 17480: Content sink
diff --git a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch
index fc11959..e7fd09f 100644
--- a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch
+++ b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch
@@ -1,4 +1,4 @@
-From 162ae0788f7bca552b6ff319d6fd981fc0b96b2a Mon Sep 17 00:00:00 2001
+From b9d9eccfeb4d08804a02b7d09576f14526c90ff0 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra@xxxxxxxxx>
 Date: Sun, 2 Oct 2016 08:46:55 -0700
 Subject: [PATCH 21/27] SASL ECDSA-NIST256P-CHALLENGE
diff --git a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch
index 81f2cd8..3aeac23 100644
--- a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch
+++ b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch
@@ -1,4 +1,4 @@
-From 5293fe4db12ee2fda30ed452335789e7709c809d Mon Sep 17 00:00:00 2001
+From 64ee29ad8a94480af037f35ade04810ca0e1031d Mon Sep 17 00:00:00 2001
 From: aleth <aleth@xxxxxxxxxxxxxxx>
 Date: Wed, 26 Oct 2016 20:16:58 +0200
 Subject: [PATCH 22/27] Bug 1313137 - "msg is not defined" error in
diff --git a/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch
index 9f0aebb..970e181 100644
--- a/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch
+++ b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch
@@ -1,4 +1,4 @@
-From 40cd830e6d90bad7810dccadc2b944c246659e99 Mon Sep 17 00:00:00 2001
+From a9a6176b88f5c1d55a82058181c2c2f0684743ff Mon Sep 17 00:00:00 2001
 From: aleth <aleth@xxxxxxxxxxxxxxx>
 Date: Thu, 12 May 2016 15:10:43 +0200
 Subject: [PATCH 23/27] Bug 954368 - Contact list entries should adapt their
diff --git a/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch b/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch
index 5ad39e2..4c2516c 100644
--- a/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch
+++ b/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch
@@ -1,4 +1,4 @@
-From 8c8930d1d6fe933814adfe6ef828f4ef4fe76a6b Mon Sep 17 00:00:00 2001
+From c8130e504c68957e03541d522429bad31c5c5d21 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra@xxxxxxxxx>
 Date: Sat, 5 Nov 2016 14:55:20 -0700
 Subject: [PATCH 24/27] Bug 1187281 - Only show "close" button on Windows
diff --git a/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch b/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch
index 9144d64..1722403 100644
--- a/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch
+++ b/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch
@@ -1,4 +1,4 @@
-From fd1b3c76721f43025219f2a5f76e5f33ffa20a9e Mon Sep 17 00:00:00 2001
+From 28b6432939ad61eacfe8c1e9559b3d5382298947 Mon Sep 17 00:00:00 2001
 From: Patrick Cloke <clokep@xxxxxxxxx>
 Date: Wed, 9 Nov 2016 09:03:49 -0800
 Subject: [PATCH 25/27] Bug 1316000 - Remove old Yahoo! Messenger support.
diff --git a/projects/instantbird/0026-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch b/projects/instantbird/0026-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch
index 34387ec..1beef80 100644
--- a/projects/instantbird/0026-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch
+++ b/projects/instantbird/0026-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch
@@ -1,4 +1,4 @@
-From d210341ceb40de88a99ac22c1714e4c01bb504af Mon Sep 17 00:00:00 2001
+From b8b4eee34d1e88ffc0100c2c3f8e91a8afba1f01 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra@xxxxxxxxx>
 Date: Thu, 1 Dec 2016 13:25:42 -0800
 Subject: [PATCH 26/27] Bug 1321641 - Use built-in functions instead of an svg
diff --git a/projects/instantbird/0027-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch b/projects/instantbird/0027-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch
index 27e6c65..23fa129 100644
--- a/projects/instantbird/0027-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch
+++ b/projects/instantbird/0027-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch
@@ -1,4 +1,4 @@
-From 00e2ca60ebfa8d78824cb5e21917d9580ddf6d25 Mon Sep 17 00:00:00 2001
+From 0e9e3c12e782b4c4f010115b9115775b7e829f3f Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra@xxxxxxxxx>
 Date: Thu, 1 Dec 2016 14:34:51 -0800
 Subject: [PATCH 27/27] Bug 1321420 - Add a pref to disable JavaScript in
diff --git a/projects/instantbird/config b/projects/instantbird/config
index 336502c..2e4ded1 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_5_1_RELEASE
+hg_hash: THUNDERBIRD_45_6_0_RELEASE
 filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %]"
 remote_docker: 1
 var:

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits