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

[tor-commits] [tor-messenger-build/master] Bug 13855: Use known onions for XMPP servers



commit bbded9cef95914552735e0fa4c8779bc07b15911
Author: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
Date:   Tue Aug 15 21:39:53 2017 -0400

    Bug 13855: Use known onions for XMPP servers
---
 .../0001-Set-Tor-Messenger-preferences.patch       |   6 +-
 ...c-21634-Autologin-default-should-be-false.patch |   6 +-
 .../0003-XMPP-in-band-registration.patch           |   6 +-
 .../instantbird/0004-Remove-search-from-UI.patch   |   6 +-
 .../0005-Add-Tor-Messenger-branding.patch          |  23 ++--
 ...ve-option-for-configuring-account-picture.patch |   6 +-
 .../0007-Modify-top-protocol-defaults.patch        |   6 +-
 .../instantbird/0008-Modify-IRC-defaults.patch     |   6 +-
 .../0009-Do-not-set-default-XMPP-server.patch      |   6 +-
 projects/instantbird/0010-Modify-themes.patch      |   6 +-
 projects/instantbird/0011-Remove-logging-UI.patch  |   6 +-
 projects/instantbird/0012-Cert-override.patch      |   6 +-
 .../0013-Display-all-traffic-over-Tor.patch        |   6 +-
 .../instantbird/0014-Trac-17480-Content-sink.patch |   6 +-
 .../0015-SASL-ECDSA-NIST256P-CHALLENGE.patch       |   6 +-
 ...-Use-built-in-functions-instead-of-an-svg.patch |   6 +-
 ...-Add-a-pref-to-disable-JavaScript-in-brow.patch |   6 +-
 ...517-Use-different-color-for-Add-Exception.patch |   6 +-
 ...21736-Hide-account-timestamp-from-message.patch |   6 +-
 ...wed-duplicated-files-for-Windows-and-Linu.patch |   6 +-
 ...g-13855-Use-known-onions-for-XMPP-servers.patch | 143 +++++++++++++++++++++
 projects/instantbird/config                        |   1 +
 22 files changed, 212 insertions(+), 69 deletions(-)

diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
index 63dab5d..0f90002 100644
--- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
+++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
@@ -1,7 +1,7 @@
-From 54583578a3e2753cd5fee169596325fa761d5554 Mon Sep 17 00:00:00 2001
+From 84b615b2662ff85ad071d988455e17dbca96e0aa Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Wed, 26 Jul 2017 14:30:41 -0400
-Subject: [PATCH 01/20] Set Tor Messenger preferences
+Subject: [PATCH 01/21] Set Tor Messenger preferences
 
 ---
  im/app/profile/all-instantbird.js | 451 ++++++++++++++++++++++++++++++++++++--
@@ -551,5 +551,5 @@ index 127c86a662..454ca7ea1b 100644
 +#expand pref("torbrowser.version", __TOR_BROWSER_VERSION__);
 +#endif
 -- 
-2.13.3
+2.14.1
 
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 b075186..4194828 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,7 +1,7 @@
-From d6d5054c6dd1aaa01d14729ebcbd423dec2146b7 Mon Sep 17 00:00:00 2001
+From 7e93084b924a4a3ffdaf6576b1e948f96ae4bcc5 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra@xxxxxxxxx>
 Date: Mon, 16 Nov 2015 20:37:53 -0800
-Subject: [PATCH 02/20] Trac 21634: Autologin default should be false
+Subject: [PATCH 02/21] Trac 21634: Autologin default should be false
 
 ---
  chat/components/src/imAccounts.js | 2 +-
@@ -35,5 +35,5 @@ index d51df3225c..904d22ba57 100644
  
  </wizard>
 -- 
-2.13.3
+2.14.1
 
diff --git a/projects/instantbird/0003-XMPP-in-band-registration.patch b/projects/instantbird/0003-XMPP-in-band-registration.patch
index bf68dac..6272854 100644
--- a/projects/instantbird/0003-XMPP-in-band-registration.patch
+++ b/projects/instantbird/0003-XMPP-in-band-registration.patch
@@ -1,7 +1,7 @@
-From d4e57e5009a5c14ddec53518352862d0fbc5aeb9 Mon Sep 17 00:00:00 2001
+From 4cc5afe3185cc2fcbc934392e088ee4ff83f39a6 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Wed, 26 Jul 2017 15:09:40 -0400
-Subject: [PATCH 03/20] XMPP in-band registration
+Subject: [PATCH 03/21] XMPP in-band registration
 
 ---
  chat/locales/en-US/xmpp.properties                 |   5 +
@@ -392,5 +392,5 @@ index 43d0f19e3f..c46fb2f956 100644
 +
 +<!ENTITY registerXMPP.label "Create this new account on the server">
 -- 
-2.13.3
+2.14.1
 
diff --git a/projects/instantbird/0004-Remove-search-from-UI.patch b/projects/instantbird/0004-Remove-search-from-UI.patch
index 3fefe06..f4a32e4 100644
--- a/projects/instantbird/0004-Remove-search-from-UI.patch
+++ b/projects/instantbird/0004-Remove-search-from-UI.patch
@@ -1,7 +1,7 @@
-From 7ecf693b9af472fce841b2bf10ea332967e5de91 Mon Sep 17 00:00:00 2001
+From 33ccdd4229b2cc15c19c3e25048d8a3abdfec82d Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Mon, 10 Oct 2016 18:47:48 -0700
-Subject: [PATCH 04/20] Remove search from UI
+Subject: [PATCH 04/21] Remove search from UI
 
 ---
  im/content/nsContextMenu.js         | 18 +-----------------
@@ -60,5 +60,5 @@ index fad67c190b..cfe2405ea3 100644
            <groupbox>
              <caption label="&configEditDesc.label;"/>
 -- 
-2.13.3
+2.14.1
 
diff --git a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch
index 4864018..2a9f3bd 100644
--- a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch
+++ b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch
@@ -1,13 +1,13 @@
-From c763e4771c903d78ed5168fe4746b9d035d56d85 Mon Sep 17 00:00:00 2001
+From 58f6a00e81e0d20cfe61d7c6dd230190f3e33a89 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Wed, 26 Jul 2017 15:46:51 -0400
-Subject: [PATCH 05/20] Add Tor Messenger branding
+Subject: [PATCH 05/21] Add Tor Messenger branding
 
 ---
  im/app/macbuild/Contents/Info.plist.in             |   2 +-
  im/branding/messenger/Makefile.in                  |  49 ++
  im/branding/messenger/background.png               | Bin 0 -> 1143 bytes
- im/branding/messenger/branding.nsi                 |  13 +
+ im/branding/messenger/branding.nsi                 |  12 +
  im/branding/messenger/configure.sh                 |   5 +
  im/branding/messenger/content/about-credits.png    | Bin 0 -> 15182 bytes
  im/branding/messenger/content/about-footer.png     | Bin 0 -> 764 bytes
@@ -54,7 +54,7 @@ Subject: [PATCH 05/20] Add Tor Messenger branding
  im/content/jar.mn                                  |   3 +-
  .../en-US/chrome/instantbird/aboutDialog.dtd       | 139 ++++-
  im/locales/en-US/updater/updater.ini               |   2 +-
- 50 files changed, 1691 insertions(+), 160 deletions(-)
+ 50 files changed, 1690 insertions(+), 160 deletions(-)
  create mode 100644 im/branding/messenger/Makefile.in
  create mode 100644 im/branding/messenger/background.png
  create mode 100755 im/branding/messenger/branding.nsi
@@ -183,10 +183,10 @@ HcmV?d00001
 
 diff --git a/im/branding/messenger/branding.nsi b/im/branding/messenger/branding.nsi
 new file mode 100755
-index 0000000000..4683827fae
+index 0000000000..57a3e4b314
 --- /dev/null
 +++ b/im/branding/messenger/branding.nsi
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,12 @@
 +# 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/.
@@ -199,7 +199,6 @@ index 0000000000..4683827fae
 +!define CompanyName           "Tor Project"
 +!define URLInfoAbout          "https://www.torproject.org";
 +!define URLUpdateInfo         "https://www.torproject.org";
-+
 diff --git a/im/branding/messenger/configure.sh b/im/branding/messenger/configure.sh
 new file mode 100644
 index 0000000000..7e580518b9
@@ -4658,7 +4657,7 @@ index 0000000000..e265f239c7
 +  }
 +}
 diff --git a/im/content/aboutDialog.xul b/im/content/aboutDialog.xul
-index c20b4f7add..4fd375d1ad 100644
+index c20b4f7add..edbff07aa4 100644
 --- a/im/content/aboutDialog.xul
 +++ b/im/content/aboutDialog.xul
 @@ -5,126 +5,165 @@
@@ -4922,7 +4921,7 @@ index c20b4f7add..4fd375d1ad 100644
 +    </description>
 +
 +  </vbox>
-+  
++
 +  <keyset>
 +    <key keycode="VK_ESCAPE" oncommand="window.close();"/>
 +  </keyset>
@@ -4968,7 +4967,7 @@ index 88662ff437..5d40350089 100644
  	content/instantbird/accounts.js
  *	content/instantbird/accounts.xul
 diff --git a/im/locales/en-US/chrome/instantbird/aboutDialog.dtd b/im/locales/en-US/chrome/instantbird/aboutDialog.dtd
-index ecd8d9d248..187cf5c3e1 100644
+index ecd8d9d248..5d4285d5ab 100644
 --- a/im/locales/en-US/chrome/instantbird/aboutDialog.dtd
 +++ b/im/locales/en-US/chrome/instantbird/aboutDialog.dtd
 @@ -1,10 +1,129 @@
@@ -5074,7 +5073,7 @@ index ecd8d9d248..187cf5c3e1 100644
 +<!ENTITY update.unsupported.linkText "Learn more">
 +<!ENTITY update.unsupported.end      "">
 +
-+<!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
++<!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and
 +     update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
 +     is all in one line, try to make the localized text short (see bug 596813 for screenshots). The â?? is
 +     the "em dash" (long dash).
@@ -5122,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.13.3
+2.14.1
 
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 ddea539..284c6ce 100644
--- a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch
+++ b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch
@@ -1,7 +1,7 @@
-From 1e652fd4e70fd6ffce2dec9be8ed2826b2607406 Mon Sep 17 00:00:00 2001
+From b8f2cc52982c7ad5a0bf6065b2c543a0b8ce980b Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Mon, 10 Oct 2016 19:24:09 -0700
-Subject: [PATCH 06/20] Remove option for configuring account picture
+Subject: [PATCH 06/21] Remove option for configuring account picture
 
 ---
  im/content/blist.xul | 3 +--
@@ -22,5 +22,5 @@ index 843f1eef57..71ee2c9ef8 100644
          <panel id="changeUserIconPanel"
                 type="arrow" align="center"
 -- 
-2.13.3
+2.14.1
 
diff --git a/projects/instantbird/0007-Modify-top-protocol-defaults.patch b/projects/instantbird/0007-Modify-top-protocol-defaults.patch
index 83428fa..e573a16 100644
--- a/projects/instantbird/0007-Modify-top-protocol-defaults.patch
+++ b/projects/instantbird/0007-Modify-top-protocol-defaults.patch
@@ -1,7 +1,7 @@
-From 38a38fc162111ed0a9983ceefccbdbac81e73bcc Mon Sep 17 00:00:00 2001
+From abca165ac3a238cf896444ef1062dd3413ab7003 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Wed, 26 Jul 2017 16:16:09 -0400
-Subject: [PATCH 07/20] Modify top protocol defaults
+Subject: [PATCH 07/21] Modify top protocol defaults
 
 ---
  im/content/accountWizard.xul                                 | 2 +-
@@ -35,5 +35,5 @@ index efb0b77aee..83f807181f 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.13.3
+2.14.1
 
diff --git a/projects/instantbird/0008-Modify-IRC-defaults.patch b/projects/instantbird/0008-Modify-IRC-defaults.patch
index 3f2e33f..b98eb56 100644
--- a/projects/instantbird/0008-Modify-IRC-defaults.patch
+++ b/projects/instantbird/0008-Modify-IRC-defaults.patch
@@ -1,7 +1,7 @@
-From a6b4c0169258cdbac8efe64456ac8d9fbe6bb468 Mon Sep 17 00:00:00 2001
+From 7a406cd69822b331fed519f85cd80845d66fb054 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Mon, 10 Oct 2016 19:31:58 -0700
-Subject: [PATCH 08/20] Modify IRC defaults
+Subject: [PATCH 08/21] Modify IRC defaults
 
  * ctcp ping
 
@@ -61,5 +61,5 @@ index 43ed2ced4b..c2f16bee84 100644
                   ". Sending TIME response: \"" + now + "\".");
          this.sendCTCPMessage(aMessage.origin, true, "TIME", ":" + now);
 -- 
-2.13.3
+2.14.1
 
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 7be234d..c8cb5be 100644
--- a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch
+++ b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch
@@ -1,7 +1,7 @@
-From 8a766e365c6dca55dec95cae000f6c30054b8467 Mon Sep 17 00:00:00 2001
+From 715152543027e0c8b2e0bf8a96777855ee6b244c Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Fri, 28 Jul 2017 12:11:57 -0400
-Subject: [PATCH 09/20] Do not set default XMPP server
+Subject: [PATCH 09/21] Do not set default XMPP server
 
 ---
  chat/protocols/xmpp/xmpp.js | 2 +-
@@ -21,5 +21,5 @@ index 2afb15f059..1d2c167d3e 100644
  
    options: {
 -- 
-2.13.3
+2.14.1
 
diff --git a/projects/instantbird/0010-Modify-themes.patch b/projects/instantbird/0010-Modify-themes.patch
index 4a036d6..0514ae8 100644
--- a/projects/instantbird/0010-Modify-themes.patch
+++ b/projects/instantbird/0010-Modify-themes.patch
@@ -1,7 +1,7 @@
-From bc8f0f3298a6c69f381ae1640ae93e770259e65a Mon Sep 17 00:00:00 2001
+From 1867c1d9e13691424ab7b688a3c9e2247b92196c Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Mon, 10 Oct 2016 19:36:38 -0700
-Subject: [PATCH 10/20] Modify themes
+Subject: [PATCH 10/21] Modify themes
 
  * theme extension update
 
@@ -74,5 +74,5 @@ index 454e366960..18ba1f95cc 100644
            <separator class="thin"/>
            <description>&emoticonsPreview.description;</description>
 -- 
-2.13.3
+2.14.1
 
diff --git a/projects/instantbird/0011-Remove-logging-UI.patch b/projects/instantbird/0011-Remove-logging-UI.patch
index 822b86c..cbc228e 100644
--- a/projects/instantbird/0011-Remove-logging-UI.patch
+++ b/projects/instantbird/0011-Remove-logging-UI.patch
@@ -1,7 +1,7 @@
-From 866ec2d04c3026066fca270667d4e3eba2e6ae88 Mon Sep 17 00:00:00 2001
+From d8dc3bfb1ed8c540fa39f809ae2b9c908ecd94ea Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Mon, 10 Oct 2016 19:50:48 -0700
-Subject: [PATCH 11/20] Remove logging UI
+Subject: [PATCH 11/21] Remove logging UI
 
 ---
  im/content/preferences/privacy.xul | 20 --------------------
@@ -39,5 +39,5 @@ index 7c9db1cdd8..2d7b2701ea 100644
      <groupbox id="passwordsGroup" orient="vertical">
        <caption label="&passwords.label;"/>
 -- 
-2.13.3
+2.14.1
 
diff --git a/projects/instantbird/0012-Cert-override.patch b/projects/instantbird/0012-Cert-override.patch
index 86f5acf..cda9ffb 100644
--- a/projects/instantbird/0012-Cert-override.patch
+++ b/projects/instantbird/0012-Cert-override.patch
@@ -1,7 +1,7 @@
-From 6d7ae07b5b740fe9c00191c0fb747920ba7708de Mon Sep 17 00:00:00 2001
+From 705b7d16542a4fa144adab92e22c44a04cf25f08 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Mon, 10 Oct 2016 19:56:46 -0700
-Subject: [PATCH 12/20] Cert override
+Subject: [PATCH 12/21] Cert override
 
 ---
  im/app/profile/cert_override.txt | 3 +++
@@ -60,5 +60,5 @@ index def78c809c..614d52bca2 100644
  #ifdef XP_MACOSX
  @RESPATH@/components/ibDockBadge.js
 -- 
-2.13.3
+2.14.1
 
diff --git a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch
index 5c4e60c..22dfbb2 100644
--- a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch
+++ b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch
@@ -1,7 +1,7 @@
-From c128779e0d663506a06d15550597f4d52e45eda5 Mon Sep 17 00:00:00 2001
+From a8ae6f8acfcebacb97393ec3a51fc0687b883f2e Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Mon, 10 Oct 2016 19:58:31 -0700
-Subject: [PATCH 13/20] Display all traffic over Tor
+Subject: [PATCH 13/21] Display all traffic over Tor
 
 ---
  im/content/accountWizard.xul                          | 2 ++
@@ -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.13.3
+2.14.1
 
diff --git a/projects/instantbird/0014-Trac-17480-Content-sink.patch b/projects/instantbird/0014-Trac-17480-Content-sink.patch
index 9f0d48d..d43a581 100644
--- a/projects/instantbird/0014-Trac-17480-Content-sink.patch
+++ b/projects/instantbird/0014-Trac-17480-Content-sink.patch
@@ -1,7 +1,7 @@
-From 9e6b44bf88fc19991a927b93e57997dfb8265bd2 Mon Sep 17 00:00:00 2001
+From 8f39e0c901880909232c40929b6c4c16550a6f1c Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra@xxxxxxxxx>
 Date: Wed, 5 Oct 2016 11:09:25 -0700
-Subject: [PATCH 14/20] Trac 17480: Content sink
+Subject: [PATCH 14/21] Trac 17480: Content sink
 
 ---
  chat/modules/imContentSink.jsm     | 33 ++++++---------------------------
@@ -107,5 +107,5 @@ index 3b8ccfa2b3..ba41da76aa 100644
            <menuitem value="0" label="&filterLevelNone;"/>
          </menupopup>
 -- 
-2.13.3
+2.14.1
 
diff --git a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch
index 34df8e0..8fa1068 100644
--- a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch
+++ b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch
@@ -1,7 +1,7 @@
-From 922ce3cce4c756d64e9e95f8a3b9876db04b0d0e Mon Sep 17 00:00:00 2001
+From 0b9845e88a70553dffe3b0f180dc6aa78004b3f5 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra@xxxxxxxxx>
 Date: Sun, 2 Oct 2016 08:46:55 -0700
-Subject: [PATCH 15/20] SASL ECDSA-NIST256P-CHALLENGE
+Subject: [PATCH 15/21] SASL ECDSA-NIST256P-CHALLENGE
 
 ---
  chat/components/src/imAccounts.js |    1 +
@@ -8915,5 +8915,5 @@ index bc25396873..e46815dfe3 100644
      'ircCAP.jsm',
      'ircCommands.jsm',
 -- 
-2.13.3
+2.14.1
 
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 eb8aa4e..caafea8 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,7 +1,7 @@
-From d1781352b4a94423900802fecd87e33e87e50cbd Mon Sep 17 00:00:00 2001
+From 55dd0aca298144d4cc7a79e00122eb428e9219de Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra@xxxxxxxxx>
 Date: Wed, 26 Jul 2017 17:14:19 -0400
-Subject: [PATCH 16/20] Bug 1321641 - Use built-in functions instead of an svg
+Subject: [PATCH 16/21] Bug 1321641 - Use built-in functions instead of an svg
  for bubbles filter
 
 ---
@@ -53,5 +53,5 @@ index 80421b8ca2..6520757ddd 100644
  
  .indicator {
 -- 
-2.13.3
+2.14.1
 
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 a336eb4..d279301 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,7 +1,7 @@
-From be3edcf0ba689d39099053416d696312f09dc89e Mon Sep 17 00:00:00 2001
+From 5d57ad7cc87c2121ff23c9f8ab2f846e18218afe Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra@xxxxxxxxx>
 Date: Wed, 26 Jul 2017 16:35:33 -0400
-Subject: [PATCH 17/20] Bug 1321420 - Add a pref to disable JavaScript in
+Subject: [PATCH 17/21] Bug 1321420 - Add a pref to disable JavaScript in
  browser requests
 
 ---
@@ -48,5 +48,5 @@ index c52c8c637d..0069219fa6 100644
                                Components.interfaces.nsIWebProgress.NOTIFY_ALL);
    let url = request.url;
 -- 
-2.13.3
+2.14.1
 
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 164e380..fa97ec4 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,7 +1,7 @@
-From 18dbc6d30ed1707c89859aca360b59edf429169e Mon Sep 17 00:00:00 2001
+From 57dfae7385e4121b3319697d0182d4784ff896f0 Mon Sep 17 00:00:00 2001
 From: Vu Quoc Huy <huyvq.c633@xxxxxxxxx>
 Date: Wed, 26 Jul 2017 16:38:19 -0400
-Subject: [PATCH 18/20] Trac 17517 - Use different color for Add Exception
+Subject: [PATCH 18/21] Trac 17517 - Use different color for Add Exception
 
 ---
  chat/content/accounts.css | 3 +++
@@ -19,5 +19,5 @@ index 807184209b..8ce7f9ad81 100644
 +  color: #fff;
 +}
 -- 
-2.13.3
+2.14.1
 
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 9ab4711..f17a910 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,7 +1,7 @@
-From 9227ec7506dee6230c95f0f04d99fe694e2f8672 Mon Sep 17 00:00:00 2001
+From 197a7c313b5cd6c65cb7dc20f10906399066e3d8 Mon Sep 17 00:00:00 2001
 From: Vu Quoc Huy <huyvq.c633@xxxxxxxxx>
 Date: Sun, 2 Apr 2017 13:07:09 -0400
-Subject: [PATCH 19/20] Trac 21736 - Hide account/timestamp from message
+Subject: [PATCH 19/21] Trac 21736 - Hide account/timestamp from message
 
 ---
  chat/modules/imThemes.jsm         | 9 ++++-----
@@ -60,5 +60,5 @@ index 454ca7ea1b..e23c93a4b3 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.13.3
+2.14.1
 
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 dae7265..8e7fe05 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,7 +1,7 @@
-From b1714145c3e94877a6d0b6bf6a4592e1d3466745 Mon Sep 17 00:00:00 2001
+From 07ebd648ddf5b9002d8c7beffcaf19339c0fc2ef Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
 Date: Thu, 27 Jul 2017 15:16:54 -0400
-Subject: [PATCH 20/20] Update allowed duplicated files for Windows and Linux
+Subject: [PATCH 20/21] Update allowed duplicated files for Windows and Linux
  builds
 
 ---
@@ -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.13.3
+2.14.1
 
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
new file mode 100644
index 0000000..f30d08d
--- /dev/null
+++ b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch
@@ -0,0 +1,143 @@
+From 5dc03a0202fc8fefef5eb3956d417a36edc26010 Mon Sep 17 00:00:00 2001
+From: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
+Date: Tue, 15 Aug 2017 16:40:33 -0400
+Subject: [PATCH 21/21] Bug 13855: Use known onions for XMPP servers
+
+---
+ im/content/accountWizard.js                        | 42 +++++++++++++++++++++-
+ im/content/accountWizard.xul                       |  6 ++--
+ .../chrome/instantbird/accountWizard.properties    |  2 ++
+ 3 files changed, 47 insertions(+), 3 deletions(-)
+
+diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js
+index 2ca9ba3b0e..e6e895ec72 100644
+--- a/im/content/accountWizard.js
++++ b/im/content/accountWizard.js
+@@ -7,6 +7,14 @@ Cu.import("resource:///modules/imServices.jsm");
+ 
+ var PREF_EXTENSIONS_GETMOREPROTOCOLSURL = "extensions.getMoreProtocolsURL";
+ 
++// Borrowed and inspired by xmpp-client.
++var kServerOnions = {
++  "riseup.net":                "4cjw6cwpeaeppfqz.onion",
++  "jabber.ccc.de":             "okj7xc6j2szr2y75.onion",
++  "jabber.otr.im":             "5rgdtlawqkcplz75.onion",
++  "jabber.calyxinstitute.org": "ijeeynrc6x2uy5ob.onion",
++}
++
+ var accountWizard = {
+   onload: function aw_onload() {
+     let topProtoList = document.getElementById("topprotolist");
+@@ -112,6 +120,21 @@ var accountWizard = {
+     return textbox;
+   },
+ 
++  insertOnionAddress: function aw_insertOnionAddress() {
++    // Currently, we only use onion addresses for XMPP.
++    if (this.proto.id == "prpl-jabber") {
++      // If the value of the domain is one for which there exists a
++      // hidden service, replace the address with the onion address.
++      this.jabberDomain = document.getElementById("username-split-0");
++      if (this.jabberDomain.value in kServerOnions) {
++        this.onionAddress = kServerOnions[this.jabberDomain.value];
++      }
++      else {
++        this.onionAddress = "";
++      }
++    }
++  },
++
+   showUsernamePage: function aw_showUsernamePage() {
+     let proto = this.proto.id;
+     if ("userNameBoxes" in this && this.userNameProto == proto) {
+@@ -173,11 +196,19 @@ var accountWizard = {
+     document.getElementById("accountusername").next = next;
+   },
+ 
++  setOnionAddress: function aw_setOnionAddress() {
++    if (this.proto.id == "prpl-jabber") {
++      document.getElementById("prpl-jabber-server").value = this.onionAddress;
++    }
++  },
++
+   showAdvanced: function aw_showAdvanced() {
+     // ensure we don't destroy user data if it's not necessary
+     let id = this.proto.id;
+-    if ("protoSpecOptId" in this && this.protoSpecOptId == id)
++    if ("protoSpecOptId" in this && this.protoSpecOptId == id) {
++      this.setOnionAddress();
+       return;
++    }
+     this.protoSpecOptId = id;
+ 
+ /* FIXME
+@@ -185,6 +216,7 @@ var accountWizard = {
+       !this.proto.newMailNotification;
+ */
+     this.populateProtoSpecificBox();
++    this.setOnionAddress();
+ 
+     let proxyVisible = this.proto.usePurpleProxy;
+     if (proxyVisible) {
+@@ -344,8 +376,16 @@ var accountWizard = {
+       let label = bundle.getFormattedString("accountColon", [opt.opt.label]);
+       rows.appendChild(this.createSummaryRow(label, opt.value));
+     }
++
++    if (this.onionAddress) {
++      let onionLabel = document.getElementById("topProtocolsBundle");
++      let onion = document.getElementById("onionAddress");
++      onion.value = onionLabel.getFormattedString("onionAddress.label",
++                                  [this.onionAddress, this.jabberDomain.value]);
++    }
+   },
+ 
++
+   createAccount: function aw_createAccount() {
+     let acc = Services.accounts.createAccount(this.username, this.proto.id);
+     if (!this.proto.noPassword && this.password)
+diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul
+index 73c9d93777..26b0bfa91c 100644
+--- a/im/content/accountWizard.xul
++++ b/im/content/accountWizard.xul
+@@ -62,7 +62,8 @@
+               label="&accountUsernameTitle.label;"
+               onpageshow="accountWizard.showUsernamePage();"
+               onpagehide="accountWizard.hideUsernamePage();"
+-              onpagerewound="return accountWizard.rewindFromUsernamePage();">
++              onpagerewound="return accountWizard.rewindFromUsernamePage();"
++              onpageadvanced="return accountWizard.insertOnionAddress();">
+     <description id="usernameInfo"/>
+     <separator/>
+     <vbox id="userNameBox"/>
+@@ -102,7 +103,7 @@
+     <checkbox id="newMailNotification"
+               label="&accountAdvanced.newMailNotification.label;" hidden="true"/>
+ 
+-    <groupbox id="protoSpecificGroupbox" class="collapsable" closed="true"
++    <groupbox id="protoSpecificGroupbox" class="collapsable" closed="false"
+               onkeypress="accountWizard.onGroupboxKeypress(event)">
+       <caption id="protoSpecificCaption"
+                onclick="accountWizard.toggleGroupbox('protoSpecificGroupbox')"/>
+@@ -141,6 +142,7 @@
+       </columns>
+       <rows id="summaryRows"/>
+     </grid>
++    <description id="onionAddress" />
+     <separator/>
+     <checkbox id="connectAutomatically" label= "&accountSummary.connectAutomatically.label;" checked="false"/>
+   </wizardpage>
+diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.properties b/im/locales/en-US/chrome/instantbird/accountWizard.properties
+index 83f807181f..60c00f9acb 100644
+--- a/im/locales/en-US/chrome/instantbird/accountWizard.properties
++++ b/im/locales/en-US/chrome/instantbird/accountWizard.properties
+@@ -20,3 +20,5 @@ topProtocol.prpl-twitter.description=Stay up to date with your Twitter timeline
+ topProtocol.prpl-aim.description=Chat with your buddies on AOL Instant Messenger
+ topProtocol.prpl-irc.description=Join IRC channels
+ topProtocol.prpl-jabber.description=Chat using the open Jabber/XMPP protocol
++
++onionAddress.label=%S is %S's onion address.
+
+-- 
+2.14.1
+
diff --git a/projects/instantbird/config b/projects/instantbird/config
index d0b5a52..5e06e81 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -69,6 +69,7 @@ input_files:
   - filename: 0018-Trac-17517-Use-different-color-for-Add-Exception.patch
   - filename: 0019-Trac-21736-Hide-account-timestamp-from-message.patch
   - filename: 0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch
+  - filename: 0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch
   - filename: mozconfig-common
   - filename: 'mozconfig-[% c("var/osname") %]'
     name: mozconfig

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