September 2017 - tor-commits - lists.torproject.org

[tor-messenger-build/esr52] Update changelog for 9accac5
by sukhbir＠torproject.org 02 Sep '17

02 Sep '17

commit 6c8777a36119ac795774d45e9bf63c0d1c9e22a4 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Sep 1 19:57:03 2017 -0400 Update changelog for 9accac5 --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 26e3181..0781e84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ Tor Messenger 0.5.0b1 -- * Trac 10942: Deterministic builds for Instantbird * Windows * Trac 17469: Tor Messenger is not working on Windows XP + * Trac 10942: Deterministic builds for Instantbird Tor Messenger 0.4.0b3 -- June 13, 2017 * All Platforms

1 0

[tor-messenger-build/esr52] Remove duplicate descriptions for accountWizard.properties
by sukhbir＠torproject.org 02 Sep '17

02 Sep '17

commit 072276a9bf420125e07156cadcd64441f0eb10df Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Sep 1 19:55:47 2017 -0400 Remove duplicate descriptions for accountWizard.properties --- .../0007-Modify-top-protocol-defaults.patch | 20 +++----------------- projects/instantbird/0008-Modify-IRC-defaults.patch | 2 +- .../0009-Do-not-set-default-XMPP-server.patch | 2 +- projects/instantbird/0010-Modify-themes.patch | 2 +- projects/instantbird/0011-Remove-logging-UI.patch | 2 +- projects/instantbird/0012-Cert-override.patch | 2 +- .../0013-Display-all-traffic-over-Tor.patch | 2 +- .../instantbird/0014-Trac-17480-Content-sink.patch | 2 +- .../0015-SASL-ECDSA-NIST256P-CHALLENGE.patch | 2 +- ...41-Use-built-in-functions-instead-of-an-svg.patch | 2 +- ...20-Add-a-pref-to-disable-JavaScript-in-brow.patch | 2 +- ...17517-Use-different-color-for-Add-Exception.patch | 2 +- ...c-21736-Hide-account-timestamp-from-message.patch | 2 +- ...lowed-duplicated-files-for-Windows-and-Linu.patch | 2 +- ...Bug-13855-Use-known-onions-for-XMPP-servers.patch | 6 +++--- .../0022-Bug-16606-Automatic-XMPP-accounts.patch | 2 +- 16 files changed, 20 insertions(+), 34 deletions(-) diff --git a/projects/instantbird/0007-Modify-top-protocol-defaults.patch b/projects/instantbird/0007-Modify-top-protocol-defaults.patch index 465f994..4cf2462 100644 --- a/projects/instantbird/0007-Modify-top-protocol-defaults.patch +++ b/projects/instantbird/0007-Modify-top-protocol-defaults.patch @@ -1,12 +1,11 @@ -From 4273f5eaed18c4454e2e44abcf65934e2c36b403 Mon Sep 17 00:00:00 2001 +From 293de6a98f59314906fb493931e4da08c145edb9 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 16:16:09 -0400 Subject: [PATCH 07/22] Modify top protocol defaults --- - im/content/accountWizard.xul | 2 +- - im/locales/en-US/chrome/instantbird/accountWizard.properties | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) + im/content/accountWizard.xul | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul index 135b68386c..356321dbcc 100644 @@ -21,19 +20,6 @@ index 135b68386c..356321dbcc 100644 onclick="if (event.button == 0) { accountWizard.openURL(this.getAttribute('getMoreURL')); }"/> </hbox> </wizardpage> -diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.properties b/im/locales/en-US/chrome/instantbird/accountWizard.properties -index efb0b77aee..83f807181f 100644 ---- a/im/locales/en-US/chrome/instantbird/accountWizard.properties -+++ b/im/locales/en-US/chrome/instantbird/accountWizard.properties -@@ -13,6 +13,8 @@ topProtocol.list=prpl-gtalk,prpl-twitter,prpl-aim,prpl-irc,prpl-jabber - # LOCALIZATION NOTE - # These are the descriptions of the top protocols specified above. - # A description should be provided for each protocol ID listed above. -+topProtocol.prpl-irc.description=Connect to your favourite IRC network -+topProtocol.prpl-jabber.description=Chat with friends using XMPP - topProtocol.prpl-gtalk.description=Talk to your Gmail contacts - 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.14.1 diff --git a/projects/instantbird/0008-Modify-IRC-defaults.patch b/projects/instantbird/0008-Modify-IRC-defaults.patch index d484fce..41d227d 100644 --- a/projects/instantbird/0008-Modify-IRC-defaults.patch +++ b/projects/instantbird/0008-Modify-IRC-defaults.patch @@ -1,4 +1,4 @@ -From 8c5a1d78d4fa63299a11683de8c722dd684925dd Mon Sep 17 00:00:00 2001 +From 5c4c225ebc5b63e6a4701bfa52857caf2ab0461d Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:31:58 -0700 Subject: [PATCH 08/22] Modify IRC defaults 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 53519ec..6ab40d6 100644 --- a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch +++ b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch @@ -1,4 +1,4 @@ -From f9e325df59a312e311fa8427db4c8970e1ea827d Mon Sep 17 00:00:00 2001 +From 3a7c66ba02524914d909b32ce716586f775aaeca Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri, 28 Jul 2017 12:11:57 -0400 Subject: [PATCH 09/22] Do not set default XMPP server diff --git a/projects/instantbird/0010-Modify-themes.patch b/projects/instantbird/0010-Modify-themes.patch index 0611c04..d12c3c5 100644 --- a/projects/instantbird/0010-Modify-themes.patch +++ b/projects/instantbird/0010-Modify-themes.patch @@ -1,4 +1,4 @@ -From 794e18ff85d131302db91c92f99e36e11af89f51 Mon Sep 17 00:00:00 2001 +From 466f8a545201f58e72d43bcf602251ab619fc189 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:36:38 -0700 Subject: [PATCH 10/22] Modify themes diff --git a/projects/instantbird/0011-Remove-logging-UI.patch b/projects/instantbird/0011-Remove-logging-UI.patch index 10356d8..33e6dc9 100644 --- a/projects/instantbird/0011-Remove-logging-UI.patch +++ b/projects/instantbird/0011-Remove-logging-UI.patch @@ -1,4 +1,4 @@ -From 1e98d5b631fef9d8d1c37589293938c2b10c7a4f Mon Sep 17 00:00:00 2001 +From 5951a00ada2bbc5dbf61b71ab339dc68646892fe Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:50:48 -0700 Subject: [PATCH 11/22] Remove logging UI diff --git a/projects/instantbird/0012-Cert-override.patch b/projects/instantbird/0012-Cert-override.patch index 8544009..fe65ceb 100644 --- a/projects/instantbird/0012-Cert-override.patch +++ b/projects/instantbird/0012-Cert-override.patch @@ -1,4 +1,4 @@ -From 333dd2f6557312497902f5b2796c212503be7c8f Mon Sep 17 00:00:00 2001 +From 015feb4d96762ffb6705091ef2713178702dcde2 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:56:46 -0700 Subject: [PATCH 12/22] Cert override diff --git a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch index 8692956..ffb6867 100644 --- a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch @@ -1,4 +1,4 @@ -From 33bcbd47beeeb7b0d96d5ed7148c528c98b7e2cb Mon Sep 17 00:00:00 2001 +From ccb6940299d87e001b392c10d028dfc3ac5b9516 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:58:31 -0700 Subject: [PATCH 13/22] Display all traffic over Tor diff --git a/projects/instantbird/0014-Trac-17480-Content-sink.patch b/projects/instantbird/0014-Trac-17480-Content-sink.patch index 97a78e7..3788ef7 100644 --- a/projects/instantbird/0014-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0014-Trac-17480-Content-sink.patch @@ -1,4 +1,4 @@ -From d0ffa62609bb4c275e3a3a68ed40d79f936c4a7d Mon Sep 17 00:00:00 2001 +From c8670c32a866081764149bf3fd6670192994d401 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 5 Oct 2016 11:09:25 -0700 Subject: [PATCH 14/22] Trac 17480: Content sink diff --git a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch index 818b868..140d522 100644 --- a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,4 +1,4 @@ -From e19c3cf5b7f56e19a1c6ed144192b3cb12f198d6 Mon Sep 17 00:00:00 2001 +From ab0108edfd75b2f4741cf0080113887d697ddf4b Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 2 Oct 2016 08:46:55 -0700 Subject: [PATCH 15/22] SASL ECDSA-NIST256P-CHALLENGE 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 5356662..fe55d6e 100644 --- a/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch +++ b/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch @@ -1,4 +1,4 @@ -From a9bb56bdb91d98709d66036b09bb39ad05436651 Mon Sep 17 00:00:00 2001 +From 5589e17c4747a3c30edc3e5a980f80abac92c744 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 29 Aug 2017 14:45:29 -0400 Subject: [PATCH 16/22] Bug 1321641 - Use built-in functions instead of an svg 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 25d50ab..1aee3e1 100644 --- a/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch +++ b/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch @@ -1,4 +1,4 @@ -From 9dc6ee85b96d16d159a5132e1e6ed1b94b068824 Mon Sep 17 00:00:00 2001 +From 75a58323c2964b36b0409a37249473f0ff39b803 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 26 Jul 2017 16:35:33 -0400 Subject: [PATCH 17/22] Bug 1321420 - Add a pref to disable JavaScript in 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 b58c717..370d12e 100644 --- a/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch +++ b/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch @@ -1,4 +1,4 @@ -From 08785730b9ccc353900cc8807b4b2cd5ae348337 Mon Sep 17 00:00:00 2001 +From baeb48bfa3e1185a533b3576c6c1afd653d963cf Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Wed, 26 Jul 2017 16:38:19 -0400 Subject: [PATCH 18/22] Trac 17517 - Use different color for Add Exception 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 a2facae..ea7c3d9 100644 --- a/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch +++ b/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch @@ -1,4 +1,4 @@ -From a2a8f798d2a6464d89da8f566cfeb6343ff1eee8 Mon Sep 17 00:00:00 2001 +From 1f7835fa96fb79e580ff76508bdebe6fe294f101 Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Sun, 2 Apr 2017 13:07:09 -0400 Subject: [PATCH 19/22] Trac 21736 - Hide account/timestamp from message 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 121d034..e1f3858 100644 --- a/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch +++ b/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch @@ -1,4 +1,4 @@ -From 89f693b09d1c8238e38351b430e31942919732cc Mon Sep 17 00:00:00 2001 +From 6e26c435c18d09198b94ed772ff4e1840d1338b2 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu, 27 Jul 2017 15:16:54 -0400 Subject: [PATCH 20/22] Update allowed duplicated files for Windows and Linux diff --git a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch index 516b29b..65a90e0 100644 --- a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch +++ b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch @@ -1,4 +1,4 @@ -From 0fe0d83b49d2f05f2e4d7952c2c7ee9b8fadd058 Mon Sep 17 00:00:00 2001 +From 3420f52e84a8902eee7394e98474781fd02014ce Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue, 15 Aug 2017 16:40:33 -0400 Subject: [PATCH 21/22] Bug 13855: Use known onions for XMPP servers @@ -128,10 +128,10 @@ index 73c9d93777..26b0bfa91c 100644 <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..7137dd2db4 100644 +index efb0b77aee..05a4deb462 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 +@@ -18,3 +18,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 diff --git a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch index 7e2dc00..89bc546 100644 --- a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch +++ b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch @@ -1,4 +1,4 @@ -From 44fc8b702b71754b1f86e38b0085f784777298d8 Mon Sep 17 00:00:00 2001 +From e3150c2c9018a68b1582a2c30c7e6821ea223c64 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 21 Aug 2017 23:00:07 -0400 Subject: [PATCH 22/22] Bug 16606: Automatic XMPP accounts

1 0

[tor-messenger-build/esr52] Update Makefile for tor-messenger-release
by sukhbir＠torproject.org 02 Sep '17

02 Sep '17

commit 73e2a43a7b396a2fd29965b8261bf7498046f5cc Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Aug 15 12:55:36 2017 -0400 Update Makefile for tor-messenger-release --- Makefile | 2 +- projects/tor-messenger-release/build | 23 ++++++++++++++++ projects/tor-messenger-release/config | 49 +++++++++++++++++++---------------- 3 files changed, 51 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index d76b0ac..cdef67c 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ all: tor-messenger tor-messenger: tor-messenger-linux-x86_64 tor-messenger-linux-i686 tor-messenger-windows-i686 tor-messenger-osx-x86_64 tor-messenger-release: submodule-update - $(rbm) build tor-messenger-release + $(rbm) build tor-messenger-release --target tormessenger-all tor-mail: tor-mail-linux-x86_64 tor-mail-linux-i686 diff --git a/projects/tor-messenger-release/build b/projects/tor-messenger-release/build new file mode 100644 index 0000000..993845f --- /dev/null +++ b/projects/tor-messenger-release/build @@ -0,0 +1,23 @@ +#!/bin/sh +[% c("var/set_default_env") -%] +[% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] +destdir="[% dest_dir _ '/' _ c("version") %]" +mkdir -p "$destdir" +[% IF c("var/tormessenger-windows-i686") -%] +mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ +[% END -%] +[% IF c("var/tormessenger-osx-x86_64") -%] +mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ +[% END -%] +[% IF c("var/tormessenger-linux-i686") -%] +mv [% c('input_files_by_name/linux-i686') %]/* "$destdir"/ +[% END -%] +[% IF c("var/tormessenger-linux-x86_64") -%] +mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ +[% END -%] +cd "$destdir" +sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt +[% IF c("var/sign_build") -%] +gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt +[% END -%] +cat sha256sums-unsigned-build.txt diff --git a/projects/tor-messenger-release/config b/projects/tor-messenger-release/config index 2258d3c..d1ce6ac 100644 --- a/projects/tor-messenger-release/config +++ b/projects/tor-messenger-release/config @@ -2,42 +2,47 @@ version: '[% c("var/tormessenger_version") %]' output_dir: 'release' +targets: + tormessenger-all: + - tormessenger-linux-x86_64 + - tormessenger-linux-i686 + - tormessenger-windows-i686 + - tormessenger-osx-x86_64 + tormessenger-linux-x86_64: + var: + tormessenger-linux-x86_64: 1 + tormessenger-linux-i686: + var: + tormessenger-linux-i686: 1 + tormessenger-windows-i686: + var: + tormessenger-windows-i686: 1 + tormessenger-osx-x86_64: + var: + tormessenger-osx-x86_64: 1 + input_files: - name: linux-x86_64 project: tor-messenger + enable: '[% c("var/tormessenger-linux-x86_64") %]' target: - - tor-messenger - - linux-x86_64 + - tormessenger-linux-x86_64 - name: linux-i686 project: tor-messenger + enable: '[% c("var/tormessenger-linux-x86_64") %]' target: - - tor-messenger - - linux-i686 + - tormessenger-linux-i686 - name: windows-i686 project: tor-messenger + enable: '[% c("var/tormessenger-windows-i686") %]' target: - - tor-messenger - - windows-i686 + - tormessenger-windows-i686 - name: osx-x86_64 project: tor-messenger + enable: '[% c("var/tormessenger-osx-x86_64") %]' target: - - tor-messenger - - osx-x86_64 - -build: | - #!/bin/sh - set -e - export LC_ALL=C - destdir="[% dest_dir _ '/' _ c("version") %]" - mkdir -p "$destdir" - mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ - mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ - mv [% c('input_files_by_name/linux-i686') %]/* "$destdir"/ - mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ - cd "$destdir" - sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt - cat sha256sums-unsigned-build.txt + - tormessenger-osx-x86_64

1 0

[tor-messenger-build/esr52] Update patch 0001 (all-instantbird.js)
by sukhbir＠torproject.org 02 Sep '17

02 Sep '17

commit 7dc624cfe9d6e8c7f58d481232b9be7e2a66b7ff Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Aug 28 22:13:42 2017 -0400 Update patch 0001 (all-instantbird.js) Set security.cert_pinning.enforcement_level to 2 just once. --- .../0001-Set-Tor-Messenger-preferences.patch | 21 ++++++++++++++++----- ...ac-21634-Autologin-default-should-be-false.patch | 2 +- .../0003-XMPP-in-band-registration.patch | 2 +- .../instantbird/0004-Remove-search-from-UI.patch | 2 +- .../0005-Add-Tor-Messenger-branding.patch | 2 +- ...ove-option-for-configuring-account-picture.patch | 2 +- .../0007-Modify-top-protocol-defaults.patch | 2 +- projects/instantbird/0008-Modify-IRC-defaults.patch | 2 +- .../0009-Do-not-set-default-XMPP-server.patch | 2 +- projects/instantbird/0010-Modify-themes.patch | 2 +- projects/instantbird/0011-Remove-logging-UI.patch | 2 +- projects/instantbird/0012-Cert-override.patch | 2 +- .../0013-Display-all-traffic-over-Tor.patch | 2 +- .../instantbird/0014-Trac-17480-Content-sink.patch | 2 +- .../0015-SASL-ECDSA-NIST256P-CHALLENGE.patch | 2 +- ...1-Use-built-in-functions-instead-of-an-svg.patch | 2 +- ...0-Add-a-pref-to-disable-JavaScript-in-brow.patch | 2 +- ...7517-Use-different-color-for-Add-Exception.patch | 2 +- ...-21736-Hide-account-timestamp-from-message.patch | 4 ++-- ...owed-duplicated-files-for-Windows-and-Linu.patch | 2 +- ...ug-13855-Use-known-onions-for-XMPP-servers.patch | 2 +- .../0022-Bug-16606-Automatic-XMPP-accounts.patch | 2 +- 22 files changed, 38 insertions(+), 27 deletions(-) diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index 454b0e6..09ed103 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,14 +1,14 @@ -From 945f92e09e833c6e6a86d2abdea5eac0da6f21a2 Mon Sep 17 00:00:00 2001 +From 730e73eb45eb1bd60f48b887e08fea837eb2fb40 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 14:30:41 -0400 Subject: [PATCH 01/22] Set Tor Messenger preferences --- - im/app/profile/all-instantbird.js | 451 ++++++++++++++++++++++++++++++++++++-- - 1 file changed, 429 insertions(+), 22 deletions(-) + im/app/profile/all-instantbird.js | 455 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 431 insertions(+), 24 deletions(-) diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index 127c86a662..454ca7ea1b 100644 +index 127c86a662..fd95a1e6b1 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js @@ -1,3 +1,53 @@ @@ -124,6 +124,17 @@ index 127c86a662..454ca7ea1b 100644 // disable logging for the search service update system by default pref("browser.search.update.log", false); +@@ -220,8 +267,8 @@ pref("services.kinto.update_enabled", false); + // Block insecure active content on https pages + pref("security.mixed_content.block_active_content", true); + +-// 1 = allow MITM for certificate pinning checks. +-pref("security.cert_pinning.enforcement_level", 1); ++// 2 = Enforce strict cert pinning. ++pref("security.cert_pinning.enforcement_level", 2); + + /* Extension manager */ + pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul"); @@ -235,10 +282,10 @@ pref("extensions.ignoreMTimeChanges", false); pref("extensions.logging.enabled", false); pref("general.skins.selectedSkin", "classic/1.0"); @@ -529,7 +540,7 @@ index 127c86a662..454ca7ea1b 100644 +pref("security.tls.unrestricted_rc4_fallback", false); + +// Enforce certificate pinning, see: https://bugs.torproject.org/16206 -+pref("security.cert_pinning.enforcement_level", 2); ++// pref("security.cert_pinning.enforcement_level", 2); // TM + +// Don't allow MitM via Microsoft Family Safety, see bug 21686 +pref("security.family_safety.mode", 0); 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 fdb5a5a..8a31703 100644 --- a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch +++ b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch @@ -1,4 +1,4 @@ -From daa4c63a9235f95096e878360e3e84f0d1da8eb6 Mon Sep 17 00:00:00 2001 +From f30bf9e5ec7b7cc90e2e1a2bf37ec5688d00297a Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Mon, 16 Nov 2015 20:37:53 -0800 Subject: [PATCH 02/22] Trac 21634: Autologin default should be false diff --git a/projects/instantbird/0003-XMPP-in-band-registration.patch b/projects/instantbird/0003-XMPP-in-band-registration.patch index 3e2aa9d..a1ac6fd 100644 --- a/projects/instantbird/0003-XMPP-in-band-registration.patch +++ b/projects/instantbird/0003-XMPP-in-band-registration.patch @@ -1,4 +1,4 @@ -From a71e9f9b63396b38184c2ee9554a0c752eed898e Mon Sep 17 00:00:00 2001 +From 9c7ed538de969fdaef7de441d275d4c2cd294d9a Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 15:09:40 -0400 Subject: [PATCH 03/22] XMPP in-band registration diff --git a/projects/instantbird/0004-Remove-search-from-UI.patch b/projects/instantbird/0004-Remove-search-from-UI.patch index ada0dc6..a63aed3 100644 --- a/projects/instantbird/0004-Remove-search-from-UI.patch +++ b/projects/instantbird/0004-Remove-search-from-UI.patch @@ -1,4 +1,4 @@ -From 93d9f82d1f4c6bb6af794bbc78510440da96dc2e Mon Sep 17 00:00:00 2001 +From b6f227a7743eff289177a7c855eb60c87d492f47 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:47:48 -0700 Subject: [PATCH 04/22] Remove search from UI diff --git a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch index dfc3bc0..7dff68d 100644 --- a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch @@ -1,4 +1,4 @@ -From 2501959f0047cc79909fe5ea2d9cf36bb49b0e84 Mon Sep 17 00:00:00 2001 +From 752e23122e3d407fe1bb316e5f1ca71e53415d69 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 15:46:51 -0400 Subject: [PATCH 05/22] Add Tor Messenger branding 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 139eb03..161a25a 100644 --- a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch +++ b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch @@ -1,4 +1,4 @@ -From 29aa4176a752fb024272145e1407c4c8294667a7 Mon Sep 17 00:00:00 2001 +From 90c949783c917b45c02ef7b6767ee22a4a8e92fe Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:24:09 -0700 Subject: [PATCH 06/22] Remove option for configuring account picture diff --git a/projects/instantbird/0007-Modify-top-protocol-defaults.patch b/projects/instantbird/0007-Modify-top-protocol-defaults.patch index 36a545e..db878ff 100644 --- a/projects/instantbird/0007-Modify-top-protocol-defaults.patch +++ b/projects/instantbird/0007-Modify-top-protocol-defaults.patch @@ -1,4 +1,4 @@ -From 7e5fbd59826780777c7b92379d78862d8bd05612 Mon Sep 17 00:00:00 2001 +From e0736b7a8ca7cea1720015c47552b6b7d7175085 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 16:16:09 -0400 Subject: [PATCH 07/22] Modify top protocol defaults diff --git a/projects/instantbird/0008-Modify-IRC-defaults.patch b/projects/instantbird/0008-Modify-IRC-defaults.patch index 1dc5e0c..4ccae28 100644 --- a/projects/instantbird/0008-Modify-IRC-defaults.patch +++ b/projects/instantbird/0008-Modify-IRC-defaults.patch @@ -1,4 +1,4 @@ -From 6024e2204e047b331726aa6e7d55f53d3f5b1f7a Mon Sep 17 00:00:00 2001 +From 14ebf2df4c9c5e7a0d2c3a9268e10b393fe63d3b Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:31:58 -0700 Subject: [PATCH 08/22] Modify IRC defaults 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 605c89d..4af3d80 100644 --- a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch +++ b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch @@ -1,4 +1,4 @@ -From e95333af34cbd0b25deb34eb30ad91a249f1273d Mon Sep 17 00:00:00 2001 +From 9ea7c5e3a1bc12ced843b1d4e19b67f333b47f10 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri, 28 Jul 2017 12:11:57 -0400 Subject: [PATCH 09/22] Do not set default XMPP server diff --git a/projects/instantbird/0010-Modify-themes.patch b/projects/instantbird/0010-Modify-themes.patch index 9158663..3998f61 100644 --- a/projects/instantbird/0010-Modify-themes.patch +++ b/projects/instantbird/0010-Modify-themes.patch @@ -1,4 +1,4 @@ -From 386c3799c372ceb41ff845e942d03d54cc8c05b9 Mon Sep 17 00:00:00 2001 +From 85ab3e684647cb41335fcc712c94a26248669a3d Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:36:38 -0700 Subject: [PATCH 10/22] Modify themes diff --git a/projects/instantbird/0011-Remove-logging-UI.patch b/projects/instantbird/0011-Remove-logging-UI.patch index 965a989..12ad58e 100644 --- a/projects/instantbird/0011-Remove-logging-UI.patch +++ b/projects/instantbird/0011-Remove-logging-UI.patch @@ -1,4 +1,4 @@ -From ae240a3b037a79565b22e2a4f2112769369485de Mon Sep 17 00:00:00 2001 +From 6427bba530252605b5895dca13514397b36bb086 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:50:48 -0700 Subject: [PATCH 11/22] Remove logging UI diff --git a/projects/instantbird/0012-Cert-override.patch b/projects/instantbird/0012-Cert-override.patch index e681f36..c306165 100644 --- a/projects/instantbird/0012-Cert-override.patch +++ b/projects/instantbird/0012-Cert-override.patch @@ -1,4 +1,4 @@ -From db82a34a94c888c4f5946a1c5741e64953145c3b Mon Sep 17 00:00:00 2001 +From e39504d2376db51c2cc5b77101b94a9fe13cd8ea Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:56:46 -0700 Subject: [PATCH 12/22] Cert override diff --git a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch index 79fb463..b532820 100644 --- a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch @@ -1,4 +1,4 @@ -From e0797717c02828c4c3cb6ba909e2dd7b60191a53 Mon Sep 17 00:00:00 2001 +From 3dc1f46d93c261253f12d108c6e06b715d0a9ba1 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:58:31 -0700 Subject: [PATCH 13/22] Display all traffic over Tor diff --git a/projects/instantbird/0014-Trac-17480-Content-sink.patch b/projects/instantbird/0014-Trac-17480-Content-sink.patch index f69e907..8f457f0 100644 --- a/projects/instantbird/0014-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0014-Trac-17480-Content-sink.patch @@ -1,4 +1,4 @@ -From 41d1a9ba1370706db0e3ac0be00e696234e557a7 Mon Sep 17 00:00:00 2001 +From 9ce5029c19bd6d1ddb1cd0d7f91b9fc3451cb7d8 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 5 Oct 2016 11:09:25 -0700 Subject: [PATCH 14/22] Trac 17480: Content sink diff --git a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch index 39aab97..7b7f0e6 100644 --- a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,4 +1,4 @@ -From 6bdfde03b90d893e66697fab2edacf65189212fe Mon Sep 17 00:00:00 2001 +From 8e54edd20a485ac7e015d6371383e20afd5401e9 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 2 Oct 2016 08:46:55 -0700 Subject: [PATCH 15/22] SASL ECDSA-NIST256P-CHALLENGE 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 688d2ab..17acc1d 100644 --- a/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch +++ b/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch @@ -1,4 +1,4 @@ -From a0d55979dcd4049dc03fc512be8dc7880af6cbfe Mon Sep 17 00:00:00 2001 +From ac74be92685ee7544465667b0acb55d1aedb814c Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 26 Jul 2017 17:14:19 -0400 Subject: [PATCH 16/22] Bug 1321641 - Use built-in functions instead of an svg 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 c1554fa..2993bff 100644 --- a/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch +++ b/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch @@ -1,4 +1,4 @@ -From f2c58bf5598e72f827dc785586a1130a859c99a7 Mon Sep 17 00:00:00 2001 +From ee7295bd39f49a23166feae02f2a1b68d52352c5 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 26 Jul 2017 16:35:33 -0400 Subject: [PATCH 17/22] Bug 1321420 - Add a pref to disable JavaScript in 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 a9e330d..91457c2 100644 --- a/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch +++ b/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch @@ -1,4 +1,4 @@ -From e3338fcbf8b93f4503332b1b6a5b19b8260e044f Mon Sep 17 00:00:00 2001 +From 8514adfb848b12498b5e819b60211cd6d2a53dd0 Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Wed, 26 Jul 2017 16:38:19 -0400 Subject: [PATCH 18/22] Trac 17517 - Use different color for Add Exception 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 cb76f05..9d661c8 100644 --- a/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch +++ b/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch @@ -1,4 +1,4 @@ -From 630a3e4368eff760c8a8445f3743a15796facd19 Mon Sep 17 00:00:00 2001 +From 6234ea255a9e81a93287eab492733ffd8c03424f Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Sun, 2 Apr 2017 13:07:09 -0400 Subject: [PATCH 19/22] Trac 21736 - Hide account/timestamp from message @@ -44,7 +44,7 @@ index a723d742bf..95d917f0d7 100644 } diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index 454ca7ea1b..e23c93a4b3 100644 +index fd95a1e6b1..fbc540bc5e 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js @@ -47,6 +47,11 @@ pref("extensions.systemAddon.update.url", ""); 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 510d3f1..4fbe1da 100644 --- a/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch +++ b/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch @@ -1,4 +1,4 @@ -From fdaaef5f4d89795c9b8e6ae9f3abe036708572ff Mon Sep 17 00:00:00 2001 +From c73ff7051711ba1c44b8d3efc158930ee57b2b73 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu, 27 Jul 2017 15:16:54 -0400 Subject: [PATCH 20/22] Update allowed duplicated files for Windows and Linux diff --git a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch index 9fe7a4f..e3abbd2 100644 --- a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch +++ b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch @@ -1,4 +1,4 @@ -From 13d28415441e3c6b481d9eed98658a6ee16784bf Mon Sep 17 00:00:00 2001 +From a98e6bc72aa36c55fc6eccd872ca943e61d752b3 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue, 15 Aug 2017 16:40:33 -0400 Subject: [PATCH 21/22] Bug 13855: Use known onions for XMPP servers diff --git a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch index 2a71000..51d95ed 100644 --- a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch +++ b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch @@ -1,4 +1,4 @@ -From f0e0efda610e24a5e191ac5e6fd583a5b6c99724 Mon Sep 17 00:00:00 2001 +From bf433088d6f7c9af269c0d42a623f164062f09ae Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 21 Aug 2017 23:00:07 -0400 Subject: [PATCH 22/22] Bug 16606: Automatic XMPP accounts

1 0

[tor-messenger-build/esr52] Update patch for temporary XMPP accounts (force autologin)
by sukhbir＠torproject.org 02 Sep '17

02 Sep '17

commit 0359c6483888b426099e1d2b5a5bdda8317f7ef7 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Aug 22 13:14:56 2017 -0400 Update patch for temporary XMPP accounts (force autologin) --- .../0022-Bug-16606-Automatic-XMPP-accounts.patch | 24 ++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch index 2f94dc3..2a71000 100644 --- a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch +++ b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch @@ -1,4 +1,4 @@ -From 8a8329f53e3ae6eaaec67fb698a4ab6f0a50d1e6 Mon Sep 17 00:00:00 2001 +From f0e0efda610e24a5e191ac5e6fd583a5b6c99724 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 21 Aug 2017 23:00:07 -0400 Subject: [PATCH 22/22] Bug 16606: Automatic XMPP accounts @@ -8,10 +8,10 @@ password are randomly generated and in-band registration is performed automatically. This can also be used for throwaway accounts. --- chat/protocols/xmpp/xmpp-session.jsm | 39 +++++++++++++--------- - im/content/accountWizard.js | 34 +++++++++++++++++++ + im/content/accountWizard.js | 39 ++++++++++++++++++++++ im/content/accountWizard.xul | 1 + .../en-US/chrome/instantbird/accountWizard.dtd | 1 + - 4 files changed, 59 insertions(+), 16 deletions(-) + 4 files changed, 64 insertions(+), 16 deletions(-) diff --git a/chat/protocols/xmpp/xmpp-session.jsm b/chat/protocols/xmpp/xmpp-session.jsm index 1c001064bd..b5b9fde11e 100644 @@ -65,7 +65,7 @@ index 1c001064bd..b5b9fde11e 100644 let xml = '<?xml version="1.0"?>'; diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js -index 7efedd5ed5..f68767f1c8 100644 +index 7efedd5ed5..e0300bf6c4 100644 --- a/im/content/accountWizard.js +++ b/im/content/accountWizard.js @@ -133,6 +133,10 @@ var accountWizard = { @@ -90,7 +90,17 @@ index 7efedd5ed5..f68767f1c8 100644 } let bundle = document.getElementById("accountsBundle"); -@@ -395,6 +401,7 @@ var accountWizard = { +@@ -307,6 +313,9 @@ var accountWizard = { + }, + + showSummary: function aw_showSummary() { ++ if (this.register) { ++ document.getElementById("connectAutomatically").checked = true; ++ } + let rows = document.getElementById("summaryRows"); + let bundle = document.getElementById("accountsBundle"); + let child; +@@ -395,6 +404,7 @@ var accountWizard = { //FIXME: newMailNotification acc.setBool("register", document.getElementById("registerXMPP").checked); @@ -98,7 +108,7 @@ index 7efedd5ed5..f68767f1c8 100644 for (let i = 0; i < this.prefs.length; ++i) { let option = this.prefs[i]; -@@ -499,6 +506,33 @@ var accountWizard = { +@@ -499,6 +509,35 @@ var accountWizard = { this.displayProxyDescription(); }, @@ -117,6 +127,7 @@ index 7efedd5ed5..f68767f1c8 100644 + this.userNameBoxes[0].disabled = true; + this.userNameBoxes[0].value = this.getRandomString(7); + document.getElementById("accountWizard").canAdvance = true; ++ this.register = true; + } + else { + domain.disabled = false; @@ -126,6 +137,7 @@ index 7efedd5ed5..f68767f1c8 100644 + this.userNameBoxes[0].disabled = false; + this.userNameBoxes[0].value = ""; + document.getElementById("accountWizard").canAdvance = false; ++ this.register = false; + } + }, +

1 0

[tor-messenger-build/esr52] Set proper ENV defaults
by sukhbir＠torproject.org 02 Sep '17

02 Sep '17

commit d92914ee2dd588b1f3f654b0d01e6f3ec527b984 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Aug 28 16:53:18 2017 -0400 Set proper ENV defaults --- projects/ctypes-otr/build | 5 +++-- projects/libgcrypt/build | 4 ++-- projects/libgpg-error/build | 4 ++-- projects/libotr/build | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/projects/ctypes-otr/build b/projects/ctypes-otr/build index 913a3e0..fa60e7f 100644 --- a/projects/ctypes-otr/build +++ b/projects/ctypes-otr/build @@ -1,5 +1,6 @@ -#!/bin/sh -set -e +#!/bin/bash +[% c("var/set_default_env") -%] + tar xf [% project %]-[% c('version') %].tar.gz tar xf [% c('input_files_by_name/libotr') %] mv libotr/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/content/ diff --git a/projects/libgcrypt/build b/projects/libgcrypt/build index 3e85542..ac27285 100644 --- a/projects/libgcrypt/build +++ b/projects/libgcrypt/build @@ -1,6 +1,6 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] mkdir -p /var/tmp/dist cd /var/tmp/dist diff --git a/projects/libgpg-error/build b/projects/libgpg-error/build index 6bdb462..9e2efe0 100644 --- a/projects/libgpg-error/build +++ b/projects/libgpg-error/build @@ -1,6 +1,6 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] + distdir="/var/tmp/dist/[% project %]" mkdir -p "$distdir" [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] diff --git a/projects/libotr/build b/projects/libotr/build index 2b02051..2f49602 100755 --- a/projects/libotr/build +++ b/projects/libotr/build @@ -1,6 +1,6 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] mkdir -p /var/tmp/dist cd /var/tmp/dist

1 0

[tor-messenger-build/esr52] Improve Windows builds (update instantbird/build)
by sukhbir＠torproject.org 02 Sep '17

02 Sep '17

commit 67cf5ed57e2186a5baace53191450d0be2628ae6 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Aug 31 20:27:50 2017 -0400 Improve Windows builds (update instantbird/build) Changes borrowed from tor-browser-buid.git/projects/firefox/build and modified for TM builds. This fixes the Windows XP bug (#17469) as well as other unreported issues which prevented Tor Messenger from starting on Windows during our testing of the transition to Firefox 52. --- projects/instantbird/build | 24 ++++++++++++++++++++++++ projects/instantbird/mozconfig-windows-i686 | 2 ++ projects/tor-messenger/build | 5 +++++ projects/tor-messenger/config | 3 +++ 4 files changed, 34 insertions(+) diff --git a/projects/instantbird/build b/projects/instantbird/build index a963d19..7813fe2 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -61,6 +61,24 @@ then fi [% IF c("var/windows") %] + # FIXME + # Ideally, using LDFLAGS (and e.g. DLLFLAGS for NSS) would be enough to get + # all Firefox libraries linked against msvcr100. Alas, this does not hold for + # NSPR. Without patching it we get a "missing entry points for _strcmpi in + # msvcr100.dll". Now, this should be fixed in rev>=6179 as the def file there + # contains a proper patch according to the mingw-w64 developers. + # However, even with this patch the _strcmpi issue is still popping up, + # probably due to a bug in our current linking setup. The small patch below + # is therefore just a workaround which should get fixed but is at least + # justified as the signature of _strcmpi and _stricmp is the same, see: + # http://msdn.microsoft.com/en-us/library/k59z8dwe.aspx. + sed 's/strcmpi/stricmp/' -i mozilla/nsprpub/pr/src/linking/prlink.c + export HOST_LDFLAGS=" " + export LDFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" + # Our flags don't get passed to NSS. We need to do that manually using an + # obscure one. + export DLLFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" + # Make sure widl is not inserting random timestamps, see #21837. export WIDL_TIME_OVERRIDE="0" [% END %] @@ -78,8 +96,13 @@ echo ac_add_options --with-tor-browser-version='[% c("var/tormessenger_version") ./mozilla/mach package mkdir -p [% dest_dir _ '/' _ c('filename') %] + mv obj-*/dist/instantbird-*.[% c('var/archive_suffix') %] [% dest_dir _ '/' _ c('filename') %]/instantbird.[% c('var/archive_suffix') %] +[% IF c("var/windows") %] + cp -a $gcclibs/libssp-0.dll [% dest_dir _ '/' _ c('filename') %]/ +[% END %] + MARTOOLS=/var/tmp/dist/mar-tools mkdir -p $MARTOOLS cp -p mozilla/config/createprecomplete.py $MARTOOLS/ @@ -97,6 +120,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% END -%] cd /var/tmp/dist + [% c('zip', { zip_src => [ 'mar-tools' ], zip_args => dest_dir _ '/' _ c('filename') _ '/' _ c('var/martools_filename'), diff --git a/projects/instantbird/mozconfig-windows-i686 b/projects/instantbird/mozconfig-windows-i686 index b6c46ad..f8e335d 100644 --- a/projects/instantbird/mozconfig-windows-i686 +++ b/projects/instantbird/mozconfig-windows-i686 @@ -1,5 +1,7 @@ export CROSS_COMPILE=1 +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw + ac_add_options --target=i686-w64-mingw32 ac_add_options --with-toolchain-prefix=i686-w64-mingw32- diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 338af34..1c11ce7 100755 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -16,6 +16,10 @@ mkdir bundle [% IF c("var/windows") -%] 7z x -y -obundle [% c('input_files_by_name/instantbird') %]/instantbird.zip mv bundle/instantbird bundle/Browser + +cp -a $rootdir/msvcr100.dll bundle/Browser +cp -a [% c('input_files_by_name/instantbird') %]/libssp-0.dll bundle/Browser + [% ELSE -%] mkdir bundle/Browser tar xf [% c('input_files_by_name/instantbird') %]/instantbird.tar.bz2 -C bundle/Browser --strip 1 @@ -122,6 +126,7 @@ python pe_checksum_fix.py mv tor-messenger-install-tmp2.exe tor-messenger-install.exe rm tor-messenger-install-tmp.exe mv tor-messenger-install.exe $OUTDIR/[% c('var/bundle_filename') %] + [% ELSE -%] [% c('tar', { tar_src => [ 'tor-messenger' ], diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index d3f15e1..56f1854 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -39,6 +39,9 @@ input_files: - project: nsis name: nsis enable: '[% c("var/windows") %]' + - URL: https://people.torproject.org/~mikeperry/mirrors/sources/msvcr100.dll + sha256sum: 1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 + enable: '[% c("var/windows") %]' - project: container-image var:

1 0

[tor-messenger-build/esr52] Bug 13855: Use known onions for XMPP servers
by sukhbir＠torproject.org 02 Sep '17

02 Sep '17

commit bbded9cef95914552735e0fa4c8779bc07b15911 Author: Sukhbir Singh <sukhbir(a)torproject.org> 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(a)torproject.org> 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(a)gmail.com> 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(a)torproject.org> 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(a)torproject.org> 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(a)torproject.org> 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(a)torproject.org> 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(a)torproject.org> 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(a)torproject.org> 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(a)torproject.org> 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(a)torproject.org> 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(a)torproject.org> 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(a)torproject.org> 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(a)torproject.org> 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(a)gmail.com> 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(a)gmail.com> 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(a)gmail.com> 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(a)gmail.com> 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(a)gmail.com> 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(a)gmail.com> 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(a)torproject.org> 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(a)torproject.org> +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

1 0

[tor-messenger-build/esr52] Update support for deterministic builds (#10942)
by sukhbir＠torproject.org 02 Sep '17

02 Sep '17

commit c10f07ab7c9f9ba884364019cef9a74863d16427 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Aug 25 12:15:08 2017 -0400 Update support for deterministic builds (#10942) --- projects/instantbird/build | 12 ++++++++++++ projects/instantbird/config | 1 + projects/instantbird/get-moz-build-date | 16 ++++++++++++++++ rbm.conf | 1 + 4 files changed, 30 insertions(+) diff --git a/projects/instantbird/build b/projects/instantbird/build index b64c8d7..a963d19 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -53,6 +53,18 @@ mv mozilla-* /var/tmp/build/[% project %]-[% c('version') %]/mozilla cd /var/tmp/build/[% project %]-[% c('version') %] +eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] $(cat im/config/version.txt)) +if [ -z $MOZ_BUILD_DATE ] +then + echo "MOZ_BUILD_DATE is not set" + exit 1 +fi + +[% IF c("var/windows") %] + # Make sure widl is not inserting random timestamps, see #21837. + export WIDL_TIME_OVERRIDE="0" +[% END %] + for patch in $(ls -1 $rootdir/*.patch | sort) do git apply -p1 < $patch diff --git a/projects/instantbird/config b/projects/instantbird/config index b9e5e42..3fa05ec 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -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: get-moz-build-date - filename: mozconfig-common - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig diff --git a/projects/instantbird/get-moz-build-date b/projects/instantbird/get-moz-build-date new file mode 100644 index 0000000..fb7298a --- /dev/null +++ b/projects/instantbird/get-moz-build-date @@ -0,0 +1,16 @@ +#!/usr/bin/perl -w +# Generate a MOZ_BUILD_DATE based on firefox version number + +use strict; + +die "wrong number of arguments" unless @ARGV == 2; +my ($year, $version) = @ARGV; +$version =~ s/\D+$//; +my @v = split(/[\.ab]/, $version); +push @v, '0' if @v < 4; +push @v, '0' if @v < 4; +my $day_of_month = int(($v[0] - 45) / 5); +my $date = 101010101 + $year * 10000000000 + $day_of_month * 1000000 + + $v[1] * 10000 + $v[2] * 100 + $v[3]; +$date += 100000000 unless $version =~ m/[ab]/; +print "export MOZ_BUILD_DATE=$date\n"; diff --git a/rbm.conf b/rbm.conf index b7b73e3..19a0c4d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -36,6 +36,7 @@ var: [% c("input_files_by_name/" _ file) %] [% END -%] + faketime: "faketime -f \"[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]\"" touch: "[% USE date %]touch -m -t [% date.format(c('timestamp'), format = '%Y%m%d%H%M') %]" sign_build: '[% ENV.RBM_SIGN_BUILD %]'

1 0

[tor-messenger-build/esr52] Bug 16606: Temporary XMPP accounts
by sukhbir＠torproject.org 02 Sep '17

02 Sep '17

commit a0c459f20779f10a13d9045ae7ef63efeb8423e5 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Aug 21 23:08:32 2017 -0400 Bug 16606: Temporary XMPP accounts --- .../0001-Set-Tor-Messenger-preferences.patch | 4 +- ...c-21634-Autologin-default-should-be-false.patch | 4 +- .../0003-XMPP-in-band-registration.patch | 4 +- .../instantbird/0004-Remove-search-from-UI.patch | 4 +- .../0005-Add-Tor-Messenger-branding.patch | 4 +- ...ve-option-for-configuring-account-picture.patch | 4 +- .../0007-Modify-top-protocol-defaults.patch | 4 +- .../instantbird/0008-Modify-IRC-defaults.patch | 4 +- .../0009-Do-not-set-default-XMPP-server.patch | 4 +- projects/instantbird/0010-Modify-themes.patch | 4 +- projects/instantbird/0011-Remove-logging-UI.patch | 4 +- projects/instantbird/0012-Cert-override.patch | 4 +- .../0013-Display-all-traffic-over-Tor.patch | 4 +- .../instantbird/0014-Trac-17480-Content-sink.patch | 4 +- .../0015-SASL-ECDSA-NIST256P-CHALLENGE.patch | 4 +- ...-Use-built-in-functions-instead-of-an-svg.patch | 4 +- ...-Add-a-pref-to-disable-JavaScript-in-brow.patch | 4 +- ...517-Use-different-color-for-Add-Exception.patch | 4 +- ...21736-Hide-account-timestamp-from-message.patch | 4 +- ...wed-duplicated-files-for-Windows-and-Linu.patch | 4 +- ...g-13855-Use-known-onions-for-XMPP-servers.patch | 9 +- .../0022-Bug-16606-Automatic-XMPP-accounts.patch | 158 +++++++++++++++++++++ projects/instantbird/config | 1 + 23 files changed, 203 insertions(+), 45 deletions(-) diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index 0f90002..454b0e6 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,7 +1,7 @@ -From 84b615b2662ff85ad071d988455e17dbca96e0aa Mon Sep 17 00:00:00 2001 +From 945f92e09e833c6e6a86d2abdea5eac0da6f21a2 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 14:30:41 -0400 -Subject: [PATCH 01/21] Set Tor Messenger preferences +Subject: [PATCH 01/22] Set Tor Messenger preferences --- im/app/profile/all-instantbird.js | 451 ++++++++++++++++++++++++++++++++++++-- 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 4194828..fdb5a5a 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 7e93084b924a4a3ffdaf6576b1e948f96ae4bcc5 Mon Sep 17 00:00:00 2001 +From daa4c63a9235f95096e878360e3e84f0d1da8eb6 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Mon, 16 Nov 2015 20:37:53 -0800 -Subject: [PATCH 02/21] Trac 21634: Autologin default should be false +Subject: [PATCH 02/22] Trac 21634: Autologin default should be false --- chat/components/src/imAccounts.js | 2 +- diff --git a/projects/instantbird/0003-XMPP-in-band-registration.patch b/projects/instantbird/0003-XMPP-in-band-registration.patch index 6272854..3e2aa9d 100644 --- a/projects/instantbird/0003-XMPP-in-band-registration.patch +++ b/projects/instantbird/0003-XMPP-in-band-registration.patch @@ -1,7 +1,7 @@ -From 4cc5afe3185cc2fcbc934392e088ee4ff83f39a6 Mon Sep 17 00:00:00 2001 +From a71e9f9b63396b38184c2ee9554a0c752eed898e Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 15:09:40 -0400 -Subject: [PATCH 03/21] XMPP in-band registration +Subject: [PATCH 03/22] XMPP in-band registration --- chat/locales/en-US/xmpp.properties | 5 + diff --git a/projects/instantbird/0004-Remove-search-from-UI.patch b/projects/instantbird/0004-Remove-search-from-UI.patch index f4a32e4..ada0dc6 100644 --- a/projects/instantbird/0004-Remove-search-from-UI.patch +++ b/projects/instantbird/0004-Remove-search-from-UI.patch @@ -1,7 +1,7 @@ -From 33ccdd4229b2cc15c19c3e25048d8a3abdfec82d Mon Sep 17 00:00:00 2001 +From 93d9f82d1f4c6bb6af794bbc78510440da96dc2e Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:47:48 -0700 -Subject: [PATCH 04/21] Remove search from UI +Subject: [PATCH 04/22] Remove search from UI --- im/content/nsContextMenu.js | 18 +----------------- diff --git a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch index 2a9f3bd..dfc3bc0 100644 --- a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch @@ -1,7 +1,7 @@ -From 58f6a00e81e0d20cfe61d7c6dd230190f3e33a89 Mon Sep 17 00:00:00 2001 +From 2501959f0047cc79909fe5ea2d9cf36bb49b0e84 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 15:46:51 -0400 -Subject: [PATCH 05/21] Add Tor Messenger branding +Subject: [PATCH 05/22] Add Tor Messenger branding --- im/app/macbuild/Contents/Info.plist.in | 2 +- diff --git a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch index 284c6ce..139eb03 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 b8f2cc52982c7ad5a0bf6065b2c543a0b8ce980b Mon Sep 17 00:00:00 2001 +From 29aa4176a752fb024272145e1407c4c8294667a7 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:24:09 -0700 -Subject: [PATCH 06/21] Remove option for configuring account picture +Subject: [PATCH 06/22] Remove option for configuring account picture --- im/content/blist.xul | 3 +-- diff --git a/projects/instantbird/0007-Modify-top-protocol-defaults.patch b/projects/instantbird/0007-Modify-top-protocol-defaults.patch index e573a16..36a545e 100644 --- a/projects/instantbird/0007-Modify-top-protocol-defaults.patch +++ b/projects/instantbird/0007-Modify-top-protocol-defaults.patch @@ -1,7 +1,7 @@ -From abca165ac3a238cf896444ef1062dd3413ab7003 Mon Sep 17 00:00:00 2001 +From 7e5fbd59826780777c7b92379d78862d8bd05612 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 16:16:09 -0400 -Subject: [PATCH 07/21] Modify top protocol defaults +Subject: [PATCH 07/22] Modify top protocol defaults --- im/content/accountWizard.xul | 2 +- diff --git a/projects/instantbird/0008-Modify-IRC-defaults.patch b/projects/instantbird/0008-Modify-IRC-defaults.patch index b98eb56..1dc5e0c 100644 --- a/projects/instantbird/0008-Modify-IRC-defaults.patch +++ b/projects/instantbird/0008-Modify-IRC-defaults.patch @@ -1,7 +1,7 @@ -From 7a406cd69822b331fed519f85cd80845d66fb054 Mon Sep 17 00:00:00 2001 +From 6024e2204e047b331726aa6e7d55f53d3f5b1f7a Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:31:58 -0700 -Subject: [PATCH 08/21] Modify IRC defaults +Subject: [PATCH 08/22] Modify IRC defaults * ctcp ping 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 c8cb5be..605c89d 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 715152543027e0c8b2e0bf8a96777855ee6b244c Mon Sep 17 00:00:00 2001 +From e95333af34cbd0b25deb34eb30ad91a249f1273d Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri, 28 Jul 2017 12:11:57 -0400 -Subject: [PATCH 09/21] Do not set default XMPP server +Subject: [PATCH 09/22] Do not set default XMPP server --- chat/protocols/xmpp/xmpp.js | 2 +- diff --git a/projects/instantbird/0010-Modify-themes.patch b/projects/instantbird/0010-Modify-themes.patch index 0514ae8..9158663 100644 --- a/projects/instantbird/0010-Modify-themes.patch +++ b/projects/instantbird/0010-Modify-themes.patch @@ -1,7 +1,7 @@ -From 1867c1d9e13691424ab7b688a3c9e2247b92196c Mon Sep 17 00:00:00 2001 +From 386c3799c372ceb41ff845e942d03d54cc8c05b9 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:36:38 -0700 -Subject: [PATCH 10/21] Modify themes +Subject: [PATCH 10/22] Modify themes * theme extension update diff --git a/projects/instantbird/0011-Remove-logging-UI.patch b/projects/instantbird/0011-Remove-logging-UI.patch index cbc228e..965a989 100644 --- a/projects/instantbird/0011-Remove-logging-UI.patch +++ b/projects/instantbird/0011-Remove-logging-UI.patch @@ -1,7 +1,7 @@ -From d8dc3bfb1ed8c540fa39f809ae2b9c908ecd94ea Mon Sep 17 00:00:00 2001 +From ae240a3b037a79565b22e2a4f2112769369485de Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:50:48 -0700 -Subject: [PATCH 11/21] Remove logging UI +Subject: [PATCH 11/22] Remove logging UI --- im/content/preferences/privacy.xul | 20 -------------------- diff --git a/projects/instantbird/0012-Cert-override.patch b/projects/instantbird/0012-Cert-override.patch index cda9ffb..e681f36 100644 --- a/projects/instantbird/0012-Cert-override.patch +++ b/projects/instantbird/0012-Cert-override.patch @@ -1,7 +1,7 @@ -From 705b7d16542a4fa144adab92e22c44a04cf25f08 Mon Sep 17 00:00:00 2001 +From db82a34a94c888c4f5946a1c5741e64953145c3b Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:56:46 -0700 -Subject: [PATCH 12/21] Cert override +Subject: [PATCH 12/22] Cert override --- im/app/profile/cert_override.txt | 3 +++ diff --git a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch index 22dfbb2..79fb463 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 a8ae6f8acfcebacb97393ec3a51fc0687b883f2e Mon Sep 17 00:00:00 2001 +From e0797717c02828c4c3cb6ba909e2dd7b60191a53 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:58:31 -0700 -Subject: [PATCH 13/21] Display all traffic over Tor +Subject: [PATCH 13/22] Display all traffic over Tor --- im/content/accountWizard.xul | 2 ++ diff --git a/projects/instantbird/0014-Trac-17480-Content-sink.patch b/projects/instantbird/0014-Trac-17480-Content-sink.patch index d43a581..f69e907 100644 --- a/projects/instantbird/0014-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0014-Trac-17480-Content-sink.patch @@ -1,7 +1,7 @@ -From 8f39e0c901880909232c40929b6c4c16550a6f1c Mon Sep 17 00:00:00 2001 +From 41d1a9ba1370706db0e3ac0be00e696234e557a7 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 5 Oct 2016 11:09:25 -0700 -Subject: [PATCH 14/21] Trac 17480: Content sink +Subject: [PATCH 14/22] Trac 17480: Content sink --- chat/modules/imContentSink.jsm | 33 ++++++--------------------------- diff --git a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch index 8fa1068..39aab97 100644 --- a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,7 +1,7 @@ -From 0b9845e88a70553dffe3b0f180dc6aa78004b3f5 Mon Sep 17 00:00:00 2001 +From 6bdfde03b90d893e66697fab2edacf65189212fe Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 2 Oct 2016 08:46:55 -0700 -Subject: [PATCH 15/21] SASL ECDSA-NIST256P-CHALLENGE +Subject: [PATCH 15/22] SASL ECDSA-NIST256P-CHALLENGE --- chat/components/src/imAccounts.js | 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 caafea8..688d2ab 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 55dd0aca298144d4cc7a79e00122eb428e9219de Mon Sep 17 00:00:00 2001 +From a0d55979dcd4049dc03fc512be8dc7880af6cbfe Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 26 Jul 2017 17:14:19 -0400 -Subject: [PATCH 16/21] Bug 1321641 - Use built-in functions instead of an svg +Subject: [PATCH 16/22] Bug 1321641 - Use built-in functions instead of an svg for bubbles filter --- 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 d279301..c1554fa 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 5d57ad7cc87c2121ff23c9f8ab2f846e18218afe Mon Sep 17 00:00:00 2001 +From f2c58bf5598e72f827dc785586a1130a859c99a7 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 26 Jul 2017 16:35:33 -0400 -Subject: [PATCH 17/21] Bug 1321420 - Add a pref to disable JavaScript in +Subject: [PATCH 17/22] Bug 1321420 - Add a pref to disable JavaScript in browser requests --- 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 fa97ec4..a9e330d 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 57dfae7385e4121b3319697d0182d4784ff896f0 Mon Sep 17 00:00:00 2001 +From e3338fcbf8b93f4503332b1b6a5b19b8260e044f Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Wed, 26 Jul 2017 16:38:19 -0400 -Subject: [PATCH 18/21] Trac 17517 - Use different color for Add Exception +Subject: [PATCH 18/22] Trac 17517 - Use different color for Add Exception --- chat/content/accounts.css | 3 +++ 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 f17a910..cb76f05 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 197a7c313b5cd6c65cb7dc20f10906399066e3d8 Mon Sep 17 00:00:00 2001 +From 630a3e4368eff760c8a8445f3743a15796facd19 Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Sun, 2 Apr 2017 13:07:09 -0400 -Subject: [PATCH 19/21] Trac 21736 - Hide account/timestamp from message +Subject: [PATCH 19/22] Trac 21736 - Hide account/timestamp from message --- chat/modules/imThemes.jsm | 9 ++++----- 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 8e7fe05..510d3f1 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 07ebd648ddf5b9002d8c7beffcaf19339c0fc2ef Mon Sep 17 00:00:00 2001 +From fdaaef5f4d89795c9b8e6ae9f3abe036708572ff Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu, 27 Jul 2017 15:16:54 -0400 -Subject: [PATCH 20/21] Update allowed duplicated files for Windows and Linux +Subject: [PATCH 20/22] Update allowed duplicated files for Windows and Linux builds --- diff --git a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch index f30d08d..9fe7a4f 100644 --- a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch +++ b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch @@ -1,7 +1,7 @@ -From 5dc03a0202fc8fefef5eb3956d417a36edc26010 Mon Sep 17 00:00:00 2001 +From 13d28415441e3c6b481d9eed98658a6ee16784bf Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue, 15 Aug 2017 16:40:33 -0400 -Subject: [PATCH 21/21] Bug 13855: Use known onions for XMPP servers +Subject: [PATCH 21/22] Bug 13855: Use known onions for XMPP servers --- im/content/accountWizard.js | 42 +++++++++++++++++++++- @@ -10,7 +10,7 @@ Subject: [PATCH 21/21] Bug 13855: Use known onions for XMPP servers 3 files changed, 47 insertions(+), 3 deletions(-) diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js -index 2ca9ba3b0e..e6e895ec72 100644 +index 2ca9ba3b0e..7efedd5ed5 100644 --- a/im/content/accountWizard.js +++ b/im/content/accountWizard.js @@ -7,6 +7,14 @@ Cu.import("resource:///modules/imServices.jsm"); @@ -128,7 +128,7 @@ index 73c9d93777..26b0bfa91c 100644 <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 +index 83f807181f..7137dd2db4 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 @@ -137,7 +137,6 @@ index 83f807181f..60c00f9acb 100644 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/0022-Bug-16606-Automatic-XMPP-accounts.patch b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch new file mode 100644 index 0000000..2f94dc3 --- /dev/null +++ b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch @@ -0,0 +1,158 @@ +From 8a8329f53e3ae6eaaec67fb698a4ab6f0a50d1e6 Mon Sep 17 00:00:00 2001 +From: Sukhbir Singh <sukhbir(a)torproject.org> +Date: Mon, 21 Aug 2017 23:00:07 -0400 +Subject: [PATCH 22/22] 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 +automatically. This can also be used for throwaway accounts. +--- + chat/protocols/xmpp/xmpp-session.jsm | 39 +++++++++++++--------- + im/content/accountWizard.js | 34 +++++++++++++++++++ + im/content/accountWizard.xul | 1 + + .../en-US/chrome/instantbird/accountWizard.dtd | 1 + + 4 files changed, 59 insertions(+), 16 deletions(-) + +diff --git a/chat/protocols/xmpp/xmpp-session.jsm b/chat/protocols/xmpp/xmpp-session.jsm +index 1c001064bd..b5b9fde11e 100644 +--- a/chat/protocols/xmpp/xmpp-session.jsm ++++ b/chat/protocols/xmpp/xmpp-session.jsm +@@ -401,23 +401,30 @@ XMPPSession.prototype = { + + this._account.reportConnecting(_("connection.gettingRegistration")); + let registerStanza = aStanza.getChildrenByNS(Stanza.NS.register)[0]; +- // If we get registration data, show the form, else quit. +- if (registerStanza.getElement(["x"])) { +- this.nodes["username"] = this._jid.node; +- registerStanza.wrappedJSObject = registerStanza; +- let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"] +- .getService(Ci.nsIWindowWatcher); +- let win = ww.openWindow(null, registerWindow, "", +- "centerscreen,chrome,modal,minimizable=no", registerStanza); +- } else { +- this.onError(null, _("connection.error.noRegistrationSupport")); +- return; +- } + +- // If the user cancelled the form, we should stop the registration. +- if (this.nodes["cancel"]) { +- this.onError(null, _("connection.error.registrationCancel")); +- return; ++ // For automatic XMPP registration, manually populate the fields. ++ if (this._account.getBool("tempRegister")) { ++ this.nodes["username"] = this._jid.node; ++ this.nodes["password"] = this._password; ++ } ++ else { ++ // If we get registration data, show the form, else quit. ++ if (registerStanza.getElement(["x"])) { ++ this.nodes["username"] = this._jid.node; ++ registerStanza.wrappedJSObject = registerStanza; ++ let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"] ++ .getService(Ci.nsIWindowWatcher); ++ let win = ww.openWindow(null, registerWindow, "", ++ "centerscreen,chrome,modal,minimizable=no", registerStanza); ++ } else { ++ this.onError(null, _("connection.error.noRegistrationSupport")); ++ return; ++ } ++ // If the user cancelled the form, we should stop the registration. ++ if (this.nodes["cancel"]) { ++ this.onError(null, _("connection.error.registrationCancel")); ++ return; ++ } + } + + let xml = '<?xml version="1.0"?>'; +diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js +index 7efedd5ed5..f68767f1c8 100644 +--- a/im/content/accountWizard.js ++++ b/im/content/accountWizard.js +@@ -133,6 +133,10 @@ var accountWizard = { + this.onionAddress = ""; + } + } ++ if (document.getElementById("tempXMPP").checked) { ++ document.getElementById("password").value = this.getRandomString(10); ++ document.getElementById("accountWizard").goTo("accountsummary"); ++ } + }, + + showUsernamePage: function aw_showUsernamePage() { +@@ -144,8 +148,10 @@ var accountWizard = { + + if (this.proto.id == "prpl-jabber") { + document.getElementById("registerXMPP").hidden = false; ++ document.getElementById("tempXMPP").hidden = false; + } else { + document.getElementById("registerXMPP").hidden = true; ++ document.getElementById("tempXMPP").hidden = true; + } + + let bundle = document.getElementById("accountsBundle"); +@@ -395,6 +401,7 @@ var accountWizard = { + //FIXME: newMailNotification + + acc.setBool("register", document.getElementById("registerXMPP").checked); ++ acc.setBool("tempRegister", document.getElementById("tempXMPP").checked); + + for (let i = 0; i < this.prefs.length; ++i) { + let option = this.prefs[i]; +@@ -499,6 +506,33 @@ var accountWizard = { + this.displayProxyDescription(); + }, + ++ getRandomString: function aw_getRandomString(len) { ++ return Math.random().toString(36).substr(2, len); ++ }, ++ ++ createTempXMPP: function aw_createTempXMPP() { ++ let domain = document.getElementById("username-split-0"); ++ let registerXMPP = document.getElementById("registerXMPP"); ++ if (document.getElementById("tempXMPP").checked) { ++ domain.disabled = true; ++ domain.value = "jabber.otr.im"; ++ registerXMPP.disabled = true; ++ registerXMPP.checked = true; ++ this.userNameBoxes[0].disabled = true; ++ this.userNameBoxes[0].value = this.getRandomString(7); ++ document.getElementById("accountWizard").canAdvance = true; ++ } ++ else { ++ domain.disabled = false; ++ domain.value = ""; ++ registerXMPP.disabled = false; ++ registerXMPP.checked = false; ++ this.userNameBoxes[0].disabled = false; ++ this.userNameBoxes[0].value = ""; ++ document.getElementById("accountWizard").canAdvance = false; ++ } ++ }, ++ + /* Check for correctness and set URL for the "Get more protocols..."-link + * Stripped down code from preferences/themes.js + */ +diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul +index 26b0bfa91c..de7dafe6e1 100644 +--- a/im/content/accountWizard.xul ++++ b/im/content/accountWizard.xul +@@ -69,6 +69,7 @@ + <vbox id="userNameBox"/> + <separator/> + <description id="duplicateAccount" hidden="true">&accountUsernameDuplicate.label;</description> ++ <checkbox id="tempXMPP" label="&tempXMPP.label;" hidden="true" oncommand="accountWizard.createTempXMPP();"/> + <checkbox id="registerXMPP" label="&registerXMPP.label;" hidden="true" /> + </wizardpage> + +diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.dtd b/im/locales/en-US/chrome/instantbird/accountWizard.dtd +index 6b49c84fad..de7fe8ed11 100644 +--- a/im/locales/en-US/chrome/instantbird/accountWizard.dtd ++++ b/im/locales/en-US/chrome/instantbird/accountWizard.dtd +@@ -34,3 +34,4 @@ + <!ENTITY accountSummary.connectAutomatically.label "Connect this account automatically."> + + <!ENTITY registerXMPP.label "Create this new account on the server"> ++<!ENTITY tempXMPP.label "Create a temporary account automatically"> +-- +2.14.1 + diff --git a/projects/instantbird/config b/projects/instantbird/config index 5e06e81..b9e5e42 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -70,6 +70,7 @@ input_files: - 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: 0022-Bug-16606-Automatic-XMPP-accounts.patch - filename: mozconfig-common - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig

1 0