Add patch for bug 15161: CTCP fingerprinting

projects/instantbird/0001-Set-Tor-Messenger-preferences.patch

@@ -1,7 +1,7 @@
-From 3aef7c8034e706afa8f0b3e31ecd03c8f9017ab4 Mon Sep 17 00:00:00 2001
+From 2a86e87ca92f2264e534fb4b177e3b64aad1f4ef Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <[email protected]>
 Date: Wed, 26 Jul 2017 14:30:41 -0400
-Subject: [PATCH 01/22] Set Tor Messenger preferences
+Subject: [PATCH 01/23] Set Tor Messenger preferences
 
 ---
  im/app/profile/all-instantbird.js | 458 ++++++++++++++++++++++++++++++++++++--

projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch

@@ -1,7 +1,7 @@
-From ab5dabcf6221b83733482587c6ccdb3975b30b46 Mon Sep 17 00:00:00 2001
+From 0ca94e32ce10935b0e2aeb56b15b574868ebdbaf Mon Sep 17 00:00:00 2001
 From: Arlo Breault <[email protected]>
 Date: Mon, 16 Nov 2015 20:37:53 -0800
-Subject: [PATCH 02/22] Trac 21634: Autologin default should be false
+Subject: [PATCH 02/23] Trac 21634: Autologin default should be false
 
 ---
  chat/components/src/imAccounts.js | 2 +-

projects/instantbird/0003-XMPP-in-band-registration.patch

@@ -1,7 +1,7 @@
-From 313ff42077e8a6aa6ca8acf9a659d991af64bdc3 Mon Sep 17 00:00:00 2001
+From e6d8a45f48ad54562e02e3a15a5487a16ce7a6cd Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <[email protected]>
 Date: Wed, 26 Jul 2017 15:09:40 -0400
-Subject: [PATCH 03/22] XMPP in-band registration
+Subject: [PATCH 03/23] XMPP in-band registration
 
 ---
  chat/locales/en-US/xmpp.properties                 |   5 +

projects/instantbird/0004-Remove-search-from-UI.patch

@@ -1,7 +1,7 @@
-From 5b47b35c62fe57b4e37b75efd9e116d6995c0b88 Mon Sep 17 00:00:00 2001
+From 26a3767e1880cd1e1b667dfd6e16d775ebc573f7 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <[email protected]>
 Date: Mon, 10 Oct 2016 18:47:48 -0700
-Subject: [PATCH 04/22] Remove search from UI
+Subject: [PATCH 04/23] Remove search from UI
 
 ---
  im/content/nsContextMenu.js         | 18 +-----------------

projects/instantbird/0005-Add-Tor-Messenger-branding.patch

@@ -1,7 +1,7 @@
-From 38fa4bd0401bc9dbcba80a7fb1d51456dae0e3b1 Mon Sep 17 00:00:00 2001
+From d12ea9156738b98ce3fe76ac68cadc947ba44a25 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <[email protected]>
 Date: Wed, 26 Jul 2017 15:46:51 -0400
-Subject: [PATCH 05/22] Add Tor Messenger branding
+Subject: [PATCH 05/23] Add Tor Messenger branding
 
 ---
  im/app/macbuild/Contents/Info.plist.in             |   2 +-

projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch

@@ -1,7 +1,7 @@
-From ca63ac2fee5d1cd4c07385c27951336ca044e0f1 Mon Sep 17 00:00:00 2001
+From bae78beb68e46aa28d9c205353008f6b08a9f8c6 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <[email protected]>
 Date: Mon, 10 Oct 2016 19:24:09 -0700
-Subject: [PATCH 06/22] Remove option for configuring account picture
+Subject: [PATCH 06/23] Remove option for configuring account picture
 
 ---
  im/content/blist.xul | 3 +--

projects/instantbird/0007-Modify-top-protocol-defaults.patch

@@ -1,7 +1,7 @@
-From 293de6a98f59314906fb493931e4da08c145edb9 Mon Sep 17 00:00:00 2001
+From ecfe66550d8a72ce54ecd5fd44f8adcc8a08f993 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <[email protected]>
 Date: Wed, 26 Jul 2017 16:16:09 -0400
-Subject: [PATCH 07/22] Modify top protocol defaults
+Subject: [PATCH 07/23] Modify top protocol defaults
 
 ---
  im/content/accountWizard.xul | 2 +-

projects/instantbird/0008-Set-default-IRC-server.patch

@@ -0,0 +1,25 @@
+From 26d577feaf868898af32ecc3402b579ba964cf41 Mon Sep 17 00:00:00 2001
+From: Sukhbir Singh <[email protected]>
+Date: Wed, 6 Sep 2017 09:44:42 -0400
+Subject: [PATCH 08/23] Set default IRC server
+
+---
+ chat/protocols/irc/irc.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chat/protocols/irc/irc.js b/chat/protocols/irc/irc.js
+index 4f056274bd..d7d5db4a99 100644
+--- a/chat/protocols/irc/irc.js
++++ b/chat/protocols/irc/irc.js
+@@ -1953,7 +1953,7 @@ ircProtocol.prototype = {
+
+   usernameSplits: [
+     {get label() { return _("options.server"); }, separator: "@",
+-     defaultValue: "chat.freenode.net", reverse: true}
++     defaultValue: "", reverse: true}
+   ],
+
+   options: {
+-- 
+2.14.1
+

projects/instantbird/0009-Do-not-set-default-XMPP-server.patch

@@ -1,7 +1,7 @@
-From 3a7c66ba02524914d909b32ce716586f775aaeca Mon Sep 17 00:00:00 2001
+From 5b05392bfffe6e2657067258ce2b9abd98e8c75c Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <[email protected]>
 Date: Fri, 28 Jul 2017 12:11:57 -0400
-Subject: [PATCH 09/22] Do not set default XMPP server
+Subject: [PATCH 09/23] Do not set default XMPP server
 
 ---
  chat/protocols/xmpp/xmpp.js | 2 +-

projects/instantbird/0010-Modify-themes.patch

@@ -1,7 +1,7 @@
-From 466f8a545201f58e72d43bcf602251ab619fc189 Mon Sep 17 00:00:00 2001
+From b80bcb869becf297fb47c9c1a92f44cbacecb91c Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <[email protected]>
 Date: Mon, 10 Oct 2016 19:36:38 -0700
-Subject: [PATCH 10/22] Modify themes
+Subject: [PATCH 10/23] Modify themes
 
  * theme extension update
 

projects/instantbird/0011-Remove-logging-UI.patch

@@ -1,7 +1,7 @@
-From 5951a00ada2bbc5dbf61b71ab339dc68646892fe Mon Sep 17 00:00:00 2001
+From 9adcf378ed13a901aa2f4cee835d194b8dae9b50 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <[email protected]>
 Date: Mon, 10 Oct 2016 19:50:48 -0700
-Subject: [PATCH 11/22] Remove logging UI
+Subject: [PATCH 11/23] Remove logging UI
 
 ---
  im/content/preferences/privacy.xul | 20 --------------------

projects/instantbird/0012-Cert-override.patch

@@ -1,7 +1,7 @@
-From 015feb4d96762ffb6705091ef2713178702dcde2 Mon Sep 17 00:00:00 2001
+From fb640cb8ce185f932548af4c2fa89835ea13e027 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <[email protected]>
 Date: Mon, 10 Oct 2016 19:56:46 -0700
-Subject: [PATCH 12/22] Cert override
+Subject: [PATCH 12/23] Cert override
 
 ---
  im/app/profile/cert_override.txt | 3 +++

projects/instantbird/0013-Display-all-traffic-over-Tor.patch

@@ -1,7 +1,7 @@
-From ccb6940299d87e001b392c10d028dfc3ac5b9516 Mon Sep 17 00:00:00 2001
+From c48da8076030ac22a45b586bdd7b87beae8b619a Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <[email protected]>
 Date: Mon, 10 Oct 2016 19:58:31 -0700
-Subject: [PATCH 13/22] Display all traffic over Tor
+Subject: [PATCH 13/23] Display all traffic over Tor
 
 ---
  im/content/accountWizard.xul                          | 2 ++

projects/instantbird/0014-Trac-17480-Content-sink.patch

@@ -1,7 +1,7 @@
-From c8670c32a866081764149bf3fd6670192994d401 Mon Sep 17 00:00:00 2001
+From a14637034ef954ee56b10ad5f57aef46571866e6 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <[email protected]>
 Date: Wed, 5 Oct 2016 11:09:25 -0700
-Subject: [PATCH 14/22] Trac 17480: Content sink
+Subject: [PATCH 14/23] Trac 17480: Content sink
 
 ---
  chat/modules/imContentSink.jsm     | 33 ++++++---------------------------

projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch

@@ -1,7 +1,7 @@
-From ab0108edfd75b2f4741cf0080113887d697ddf4b Mon Sep 17 00:00:00 2001
+From 32f9d055de75777f9a4291e15fea9cdeeffce522 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <[email protected]>
 Date: Sun, 2 Oct 2016 08:46:55 -0700
-Subject: [PATCH 15/22] SASL ECDSA-NIST256P-CHALLENGE
+Subject: [PATCH 15/23] SASL ECDSA-NIST256P-CHALLENGE
 
 ---
  chat/components/src/imAccounts.js |    1 +

projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch

@@ -1,7 +1,7 @@
-From 5589e17c4747a3c30edc3e5a980f80abac92c744 Mon Sep 17 00:00:00 2001
+From e638ccd41485b8a5074898166dc0d5ef70bfd4a8 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <[email protected]>
 Date: Tue, 29 Aug 2017 14:45:29 -0400
-Subject: [PATCH 16/22] Bug 1321641 - Use built-in functions instead of an svg
+Subject: [PATCH 16/23] Bug 1321641 - Use built-in functions instead of an svg
  for bubbles filter
 
 ---

projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch

@@ -1,7 +1,7 @@
-From 75a58323c2964b36b0409a37249473f0ff39b803 Mon Sep 17 00:00:00 2001
+From f000ab04295e44c26ad63cd08730c4eaf196b063 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <[email protected]>
 Date: Wed, 26 Jul 2017 16:35:33 -0400
-Subject: [PATCH 17/22] Bug 1321420 - Add a pref to disable JavaScript in
+Subject: [PATCH 17/23] Bug 1321420 - Add a pref to disable JavaScript in
  browser requests
 
 ---

projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch

@@ -1,7 +1,7 @@
-From baeb48bfa3e1185a533b3576c6c1afd653d963cf Mon Sep 17 00:00:00 2001
+From b723d4de0d05219342e0c25353c29f1863a9df5a Mon Sep 17 00:00:00 2001
 From: Vu Quoc Huy <[email protected]>
 Date: Wed, 26 Jul 2017 16:38:19 -0400
-Subject: [PATCH 18/22] Trac 17517 - Use different color for Add Exception
+Subject: [PATCH 18/23] Trac 17517 - Use different color for Add Exception
 
 ---
  chat/content/accounts.css | 3 +++

projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch

@@ -1,7 +1,7 @@
-From 1f7835fa96fb79e580ff76508bdebe6fe294f101 Mon Sep 17 00:00:00 2001
+From 69329d669c7009637dd65800dd3b66e9e09f761e Mon Sep 17 00:00:00 2001
 From: Vu Quoc Huy <[email protected]>
 Date: Sun, 2 Apr 2017 13:07:09 -0400
-Subject: [PATCH 19/22] Trac 21736 - Hide account/timestamp from message
+Subject: [PATCH 19/23] Trac 21736 - Hide account/timestamp from message
 
 ---
  chat/modules/imThemes.jsm         | 9 ++++-----

projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch

@@ -1,7 +1,7 @@
-From 6e26c435c18d09198b94ed772ff4e1840d1338b2 Mon Sep 17 00:00:00 2001
+From 69a7dd89fcd1e450e9eca2a19a7671c435494779 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <[email protected]>
 Date: Thu, 27 Jul 2017 15:16:54 -0400
-Subject: [PATCH 20/22] Update allowed duplicated files for Windows and Linux
+Subject: [PATCH 20/23] Update allowed duplicated files for Windows and Linux
  builds
 
 ---

projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch

@@ -1,7 +1,7 @@
-From 3420f52e84a8902eee7394e98474781fd02014ce Mon Sep 17 00:00:00 2001
+From 59e7ff55e9a1cd5646c3d51c6088f4e0aa5503bf Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <[email protected]>
 Date: Tue, 15 Aug 2017 16:40:33 -0400
-Subject: [PATCH 21/22] Bug 13855: Use known onions for XMPP servers
+Subject: [PATCH 21/23] Bug 13855: Use known onions for XMPP servers
 
 ---
  im/content/accountWizard.js                        | 42 +++++++++++++++++++++-

projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch

@@ -1,7 +1,7 @@
-From e3150c2c9018a68b1582a2c30c7e6821ea223c64 Mon Sep 17 00:00:00 2001
+From 76df7e308d3220430e85be0e2e4cc521295ddd96 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <[email protected]>
 Date: Mon, 21 Aug 2017 23:00:07 -0400
-Subject: [PATCH 22/22] Bug 16606: Automatic XMPP accounts
+Subject: [PATCH 22/23] Bug 16606: Automatic XMPP accounts
 
 Add support for "temporary" XMPP accounts for which the username and
 password are randomly generated and in-band registration is performed

projects/instantbird/0008-Modify-IRC-defaults.patch → projects/instantbird/0023-Handle-CTCP-requests.patch

@@ -1,33 +1,18 @@
-From 5c4c225ebc5b63e6a4701bfa52857caf2ab0461d Mon Sep 17 00:00:00 2001
+From 722cde31f73f3b8137d1dcb7bb15140e79e4a483 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <[email protected]>
-Date: Mon, 10 Oct 2016 19:31:58 -0700
-Subject: [PATCH 08/22] Modify IRC defaults
+Date: Wed, 6 Sep 2017 09:47:41 -0400
+Subject: [PATCH 23/23] Handle CTCP requests
 
- * ctcp ping
+- CTCP TIME returns the time in UTC instead of the local time with the
+seconds timer stripped to prevent detailed time resolution.
 
- * ctcp time
-
- * irc default server
+- CTCP PING is disabled.
 ---
- chat/protocols/irc/irc.js      |  2 +-
- chat/protocols/irc/ircCTCP.jsm | 16 ++--------------
- 2 files changed, 3 insertions(+), 15 deletions(-)
+ chat/protocols/irc/ircCTCP.jsm | 22 ++++++----------------
+ 1 file changed, 6 insertions(+), 16 deletions(-)
 
-diff --git a/chat/protocols/irc/irc.js b/chat/protocols/irc/irc.js
-index 4f056274bd..d7d5db4a99 100644
---- a/chat/protocols/irc/irc.js
-+++ b/chat/protocols/irc/irc.js
-@@ -1953,7 +1953,7 @@ ircProtocol.prototype = {
-
-   usernameSplits: [
-     {get label() { return _("options.server"); }, separator: "@",
--     defaultValue: "chat.freenode.net", reverse: true}
-+     defaultValue: "", reverse: true}
-   ],
-
-   options: {
 diff --git a/chat/protocols/irc/ircCTCP.jsm b/chat/protocols/irc/ircCTCP.jsm
-index 43ed2ced4b..c2f16bee84 100644
+index 43ed2ced4b..dd9c92f2bb 100644
 --- a/chat/protocols/irc/ircCTCP.jsm
 +++ b/chat/protocols/irc/ircCTCP.jsm
 @@ -167,19 +167,7 @@ var ctcpBase = {
@@ -51,15 +36,22 @@ index 43ed2ced4b..c2f16bee84 100644
 
      // These are commented out since CLIENTINFO automatically returns the
      // supported CTCP parameters and this is not supported.
-@@ -195,7 +183,7 @@ var ctcpBase = {
+@@ -195,10 +183,12 @@ var ctcpBase = {
        if (aMessage.command == "PRIVMSG") {
          // TIME
          // Received a TIME request, send a human readable response.
 -        let now = (new Date()).toString();
-+        let now = (new Date()).toUTCString();
++        let now = new Date();
++        // Strip the seconds.
++        now.setSeconds(0);
          this.LOG("Received TIME request from " + aMessage.origin +
-                  ". Sending TIME response: \"" + now + "\".");
-         this.sendCTCPMessage(aMessage.origin, true, "TIME", ":" + now);
+-                 ". Sending TIME response: \"" + now + "\".");
+-        this.sendCTCPMessage(aMessage.origin, true, "TIME", ":" + now);
++                 ". Sending TIME response: \"" + now.toUTCString() + "\".");
++        this.sendCTCPMessage(aMessage.origin, true, "TIME", ":" + now.toUTCString());
+       }
+       else {
+         // TIME :<human-readable-time-string>
 -- 
 2.14.1
 

projects/instantbird/config

@@ -56,7 +56,7 @@ input_files:
   - filename: 0005-Add-Tor-Messenger-branding.patch
   - filename: 0006-Remove-option-for-configuring-account-picture.patch
   - filename: 0007-Modify-top-protocol-defaults.patch
-  - filename: 0008-Modify-IRC-defaults.patch
+  - filename: 0008-Set-default-IRC-server.patch
   - filename: 0009-Do-not-set-default-XMPP-server.patch
   - filename: 0010-Modify-themes.patch
   - filename: 0011-Remove-logging-UI.patch
@@ -71,6 +71,7 @@ input_files:
   - filename: 0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch
   - filename: 0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch
   - filename: 0022-Bug-16606-Automatic-XMPP-accounts.patch
+  - filename: 0023-Handle-CTCP-requests.patch
   - filename: get-moz-build-date
   - filename: mozconfig-common
   - filename: 'mozconfig-[% c("var/osname") %]'