November 2016 - tor-commits - lists.torproject.org

[meek/master] Bug 19646: Mac OS: wrong location for meek browser profile
by dcf＠torproject.org 06 Nov '16

06 Nov '16

commit 73e416fe9cb97d1bde9404b71b5dfe1957affc76 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Nov 2 11:44:28 2016 -0400 Bug 19646: Mac OS: wrong location for meek browser profile On OSX, use the TOR_BROWSER_TOR_DATA_DIR environment variable value (if available) to determine the location of the meek browser profile. This fixes a problem where meek-client-torbrowser attempted to use a path under /Applications/TorBrowser-Data, to which regular users may not have write access. --- meek-client-torbrowser/linux.go | 7 ++++--- meek-client-torbrowser/mac.go | 17 +++++++++++------ meek-client-torbrowser/meek-client-torbrowser.go | 11 ++++++++--- meek-client-torbrowser/windows.go | 7 ++++--- 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/meek-client-torbrowser/linux.go b/meek-client-torbrowser/linux.go index ae363bd..71b5cfb 100644 --- a/meek-client-torbrowser/linux.go +++ b/meek-client-torbrowser/linux.go @@ -11,9 +11,10 @@ import ( ) const ( - firefoxPath = "./firefox" - firefoxProfilePath = "TorBrowser/Data/Browser/profile.meek-http-helper" - profileTemplatePath = "" + firefoxPath = "./firefox" + firefoxProfilePath = "TorBrowser/Data/Browser/profile.meek-http-helper" + torDataDirFirefoxProfilePath = "" + profileTemplatePath = "" ) func osSpecificCommandSetup(cmd *exec.Cmd) { diff --git a/meek-client-torbrowser/mac.go b/meek-client-torbrowser/mac.go index 7ec98d9..f88ed38 100644 --- a/meek-client-torbrowser/mac.go +++ b/meek-client-torbrowser/mac.go @@ -9,12 +9,17 @@ import "os/exec" const ( // During startup of meek-client-torbrowser, the browser profile is - // created and maintained under firefoxProfilePath by making a - // recursive copy of everything under profileTemplatePath. - // https://bugs.torproject.org/18904 - firefoxPath = "../firefox" - firefoxProfilePath = "../../../../TorBrowser-Data/Tor/PluggableTransports/profile.meek-http-helper" - profileTemplatePath = "../../Resources/TorBrowser/Tor/PluggableTransports/template-profile.meek-http-helper" + // created and maintained under a meek-specific directory by making a + // recursive copy of everything under profileTemplatePath (see + // https://bugs.torproject.org/18904) + // If the TOR_BROWSER_TOR_DATA_DIR env var is set, the path for the + // meek-specific profile directory is constructed by appending + // torDataDirFirefoxProfilePath to TOR_BROWSER_TOR_DATA_DIR. Otherwise, + // firefoxProfilePath (a relative path) is used. + firefoxPath = "../firefox" + torDataDirFirefoxProfilePath = "PluggableTransports/profile.meek-http-helper" + firefoxProfilePath = "../../../../TorBrowser-Data/Tor/PluggableTransports/profile.meek-http-helper" + profileTemplatePath = "../../Resources/TorBrowser/Tor/PluggableTransports/template-profile.meek-http-helper" ) func osSpecificCommandSetup(cmd *exec.Cmd) { diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index eea9087..4592495 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -206,9 +206,14 @@ func runFirefox() (cmd *exec.Cmd, stdout io.Reader, err error) { return } var profilePath string - profilePath, err = filepath.Abs(firefoxProfilePath) - if err != nil { - return + var torDataDir = os.Getenv("TOR_BROWSER_TOR_DATA_DIR") + if torDataDir != "" && torDataDirFirefoxProfilePath != "" { + profilePath = filepath.Join(torDataDir, torDataDirFirefoxProfilePath) + } else { + profilePath, err = filepath.Abs(firefoxProfilePath) + if err != nil { + return + } } err = prepareBrowserProfile(profilePath) if err != nil { diff --git a/meek-client-torbrowser/windows.go b/meek-client-torbrowser/windows.go index 3b1905e..f837e6e 100644 --- a/meek-client-torbrowser/windows.go +++ b/meek-client-torbrowser/windows.go @@ -8,9 +8,10 @@ package main import "os/exec" const ( - firefoxPath = "./firefox.exe" - firefoxProfilePath = "TorBrowser/Data/Browser/profile.meek-http-helper" - profileTemplatePath = "" + firefoxPath = "./firefox.exe" + firefoxProfilePath = "TorBrowser/Data/Browser/profile.meek-http-helper" + torDataDirFirefoxProfilePath = "" + profileTemplatePath = "" ) func osSpecificCommandSetup(cmd *exec.Cmd) {

1 0

[tor-messenger-build/master] Trac 16489: Only show "close" button on Windows
by arlo＠torproject.org 05 Nov '16

05 Nov '16

commit c4d518fde3e2c50db3de0d863d3672b95f84c820 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Nov 5 14:59:57 2016 -0700 Trac 16489: Only show "close" button on Windows --- ChangeLog | 1 + .../0001-Set-Tor-Messenger-preferences.patch | 2 +- ...0002-Trac-16489-Prevent-account-autologin.patch | 2 +- ...Support-Special-Characters-input-prompt-o.patch | 2 +- ...Better-error-reporting-for-failed-outgoin.patch | 2 +- .../0005-Trac-13312-OTR-over-Twitter-DMs.patch | 2 +- ...-Fix-tab-strip-background-colour-on-OS-X..patch | 2 +- ...-XMPP-createConversation-should-handle-in.patch | 2 +- ...-Set-_userVCard-own-property-when-downloa.patch | 2 +- .../0009-XMPP-in-band-registration.patch | 2 +- .../instantbird/0010-Remove-search-from-UI.patch | 2 +- .../0011-Add-Tor-Messenger-branding.patch | 2 +- projects/instantbird/0012-Account-picture.patch | 2 +- .../0013-Modify-protocol-defaults.patch | 2 +- .../instantbird/0014-Modify-IRC-defaults.patch | 2 +- projects/instantbird/0015-Modify-themes.patch | 2 +- .../instantbird/0016-Modify-XMPP-defaults.patch | 2 +- projects/instantbird/0017-Remove-logging-UI.patch | 2 +- projects/instantbird/0018-Cert-override.patch | 2 +- .../0019-Display-all-traffic-over-Tor.patch | 2 +- .../instantbird/0020-Trac-17480-Content-sink.patch | 2 +- .../0021-SASL-ECDSA-NIST256P-CHALLENGE.patch | 2 +- ...-msg-is-not-defined-error-in-irc.js-chang.patch | 2 +- ...Contact-list-entries-should-adapt-their-h.patch | 2 +- ...1187281-Only-show-close-button-on-Windows.patch | 25 ++++++++++++++++++++++ projects/instantbird/config | 1 + 26 files changed, 50 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3257cf8..a59d7df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ Tor Messenger 0.3.0b1 -- * Use the tor-browser-45.4.0esr-6.0-1 branch (41f1c54a) on tor-browser * Use the THUNDERBIRD_45_4_0_RELEASE tag on comm-esr45 * Update ctypes-otr to 00e4e80a + * Trac 16489: Only show "close" button on Windows * Trac 16491: Contact list entries don't adapt to the actual font size * Trac 16536: Investigate Tor Browser patches relevant to Tor Messenger * Trac 17471: Investigate Tor Browser preferences relevant to Tor Messenger diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index d485eec..55861c9 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,7 +1,7 @@ From b229ec3ed7af7f4e78b1d75a26c1ed76046ad3fe Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:48:41 -0700 -Subject: [PATCH 01/23] Set Tor Messenger preferences +Subject: [PATCH 01/24] Set Tor Messenger preferences --- im/app/profile/all-instantbird.js | 399 ++++++++++++++++++++++++++++++++++++-- diff --git a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch index 96a0b5a..0164642 100644 --- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch +++ b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch @@ -1,7 +1,7 @@ From facec2ac69b9068c63278572ffdfa432f259f373 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/23] Trac 16489: Prevent account autologin +Subject: [PATCH 02/24] Trac 16489: Prevent account autologin --- chat/components/src/imAccounts.js | 2 +- diff --git a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch index 7702b9f..78751e2 100644 --- a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch +++ b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch @@ -1,7 +1,7 @@ From e8cbcbe0aab97d75fec3abe65b575f3e814e7837 Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Sat, 30 Jan 2016 20:56:38 +0100 -Subject: [PATCH 03/23] Trac 17896: Support "Special Characters" input prompt +Subject: [PATCH 03/24] Trac 17896: Support "Special Characters" input prompt on OS X * Bug 1151784 - Add Edit menu to the conversation window on OS X. r=nhnt11,florian diff --git a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch index 9aa4468..9ead7ba 100644 --- a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch +++ b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch @@ -1,7 +1,7 @@ From 922480805c668eecb6edbbda2b2a4dfb61107144 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 2 Feb 2016 16:04:51 -0800 -Subject: [PATCH 04/23] Trac 17494: Better error reporting for failed outgoing +Subject: [PATCH 04/24] Trac 17494: Better error reporting for failed outgoing messages * Bug 1245325 - Better error reporting for failed outgoing messages. r=clokep diff --git a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch index ba27e8c..a76c4c0 100644 --- a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch +++ b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch @@ -1,7 +1,7 @@ From 6990be2c6ac257be6f8aa284814489be2c6f25ea Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 15 Mar 2016 17:40:42 -0700 -Subject: [PATCH 05/23] Trac 13312: OTR over Twitter DMs +Subject: [PATCH 05/24] Trac 13312: OTR over Twitter DMs --- chat/components/src/imConversations.js | 4 +- diff --git a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch index dce21df..ed73418 100644 --- a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch +++ b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch @@ -1,7 +1,7 @@ From ef854ddec3ec3f62d612484d7099e461fe18d128 Mon Sep 17 00:00:00 2001 From: Nihanth Subramanya <nhnt11(a)gmail.com> Date: Sun, 9 Oct 2016 21:53:04 -0700 -Subject: [PATCH 06/23] Bug 1218193 - Fix tab strip background colour on OS X. +Subject: [PATCH 06/24] Bug 1218193 - Fix tab strip background colour on OS X. r=aleth --- diff --git a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch index 2e7f702..965c3c8 100644 --- a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch +++ b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch @@ -1,7 +1,7 @@ From a60538df8166c6eb8e267ac92598706c25ff35f8 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 9 Oct 2016 21:57:07 -0700 -Subject: [PATCH 07/23] Bug 1246431 - XMPP createConversation should handle +Subject: [PATCH 07/24] Bug 1246431 - XMPP createConversation should handle incoming messages from the server properly. r=aleth --- diff --git a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch index fb53f3c..d33a7e5 100644 --- a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch +++ b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch @@ -1,7 +1,7 @@ From 2ed57a22907efdee880b30d956391d52417b01a6 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 28 Aug 2016 08:57:41 -0700 -Subject: [PATCH 08/23] Bug 1298574 - Set _userVCard own property when +Subject: [PATCH 08/24] Bug 1298574 - Set _userVCard own property when downloading vCard fails. r=aleth * This prevents an infinite req / res cycle. diff --git a/projects/instantbird/0009-XMPP-in-band-registration.patch b/projects/instantbird/0009-XMPP-in-band-registration.patch index cfa567c..be06a9a 100644 --- a/projects/instantbird/0009-XMPP-in-band-registration.patch +++ b/projects/instantbird/0009-XMPP-in-band-registration.patch @@ -1,7 +1,7 @@ From d28b2c39b8f9249490dc6499d831e6e6adbe838a Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:42:25 -0700 -Subject: [PATCH 09/23] XMPP in-band registration +Subject: [PATCH 09/24] XMPP in-band registration --- chat/locales/en-US/xmpp.properties | 5 + diff --git a/projects/instantbird/0010-Remove-search-from-UI.patch b/projects/instantbird/0010-Remove-search-from-UI.patch index 26555bc..be853f8 100644 --- a/projects/instantbird/0010-Remove-search-from-UI.patch +++ b/projects/instantbird/0010-Remove-search-from-UI.patch @@ -1,7 +1,7 @@ From 33ec527a5ba77bbe3af57666c9a25b54d2d97512 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 10/23] Remove search from UI +Subject: [PATCH 10/24] Remove search from UI --- im/content/nsContextMenu.js | 18 +----------------- diff --git a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch index 7245db5..3897cb6 100644 --- a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch @@ -1,7 +1,7 @@ From 41c60f97c6049e4e3bc130fa963616e9ddc77af6 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:56:27 -0700 -Subject: [PATCH 11/23] Add Tor Messenger branding +Subject: [PATCH 11/24] Add Tor Messenger branding --- im/app/macbuild/Contents/Info.plist.in | 2 +- diff --git a/projects/instantbird/0012-Account-picture.patch b/projects/instantbird/0012-Account-picture.patch index 5e7abb8..96ab4fd 100644 --- a/projects/instantbird/0012-Account-picture.patch +++ b/projects/instantbird/0012-Account-picture.patch @@ -1,7 +1,7 @@ From 65de52be6fbf68084231270ec14c84f225ed0fed 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 12/23] Account picture +Subject: [PATCH 12/24] Account picture --- im/content/blist.xul | 3 +-- diff --git a/projects/instantbird/0013-Modify-protocol-defaults.patch b/projects/instantbird/0013-Modify-protocol-defaults.patch index 3e5cd3a..aa9d4fe 100644 --- a/projects/instantbird/0013-Modify-protocol-defaults.patch +++ b/projects/instantbird/0013-Modify-protocol-defaults.patch @@ -1,7 +1,7 @@ From 8dd9a15845160e182b8ca44e6f4d07fdd59ffed0 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:25:34 -0700 -Subject: [PATCH 13/23] Modify protocol defaults +Subject: [PATCH 13/24] Modify protocol defaults * Top protocols diff --git a/projects/instantbird/0014-Modify-IRC-defaults.patch b/projects/instantbird/0014-Modify-IRC-defaults.patch index 83667ef..1962753 100644 --- a/projects/instantbird/0014-Modify-IRC-defaults.patch +++ b/projects/instantbird/0014-Modify-IRC-defaults.patch @@ -1,7 +1,7 @@ From ac449194473c8d254672c653b73f66350e665cc8 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 14/23] Modify IRC defaults +Subject: [PATCH 14/24] Modify IRC defaults * ctcp ping diff --git a/projects/instantbird/0015-Modify-themes.patch b/projects/instantbird/0015-Modify-themes.patch index 47a8d62..bf52e2a 100644 --- a/projects/instantbird/0015-Modify-themes.patch +++ b/projects/instantbird/0015-Modify-themes.patch @@ -1,7 +1,7 @@ From 38fbe7232753738d91ce12c4df53fe83a3192e16 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 15/23] Modify themes +Subject: [PATCH 15/24] Modify themes * theme extension updateh diff --git a/projects/instantbird/0016-Modify-XMPP-defaults.patch b/projects/instantbird/0016-Modify-XMPP-defaults.patch index 42e07c6..609a00d 100644 --- a/projects/instantbird/0016-Modify-XMPP-defaults.patch +++ b/projects/instantbird/0016-Modify-XMPP-defaults.patch @@ -1,7 +1,7 @@ From 64746206241b088e2a609662fcbe0edc3baad88b Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:38:49 -0700 -Subject: [PATCH 16/23] Modify XMPP defaults +Subject: [PATCH 16/24] Modify XMPP defaults * xmpp-default-domain diff --git a/projects/instantbird/0017-Remove-logging-UI.patch b/projects/instantbird/0017-Remove-logging-UI.patch index 83c6c6c..e651833 100644 --- a/projects/instantbird/0017-Remove-logging-UI.patch +++ b/projects/instantbird/0017-Remove-logging-UI.patch @@ -1,7 +1,7 @@ From 47bb9db3798b59d066399ec289295229a1aa4168 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 17/23] Remove logging UI +Subject: [PATCH 17/24] Remove logging UI --- im/content/preferences/privacy.xul | 20 -------------------- diff --git a/projects/instantbird/0018-Cert-override.patch b/projects/instantbird/0018-Cert-override.patch index f7c0f5a..2868e33 100644 --- a/projects/instantbird/0018-Cert-override.patch +++ b/projects/instantbird/0018-Cert-override.patch @@ -1,7 +1,7 @@ From 9ded93b407e23a54bd335d273d31496bc426ffd1 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 18/23] Cert override +Subject: [PATCH 18/24] Cert override --- im/app/profile/cert_override.txt | 3 +++ diff --git a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch index c8d5779..6bc0776 100644 --- a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch @@ -1,7 +1,7 @@ From 119c059b638fcb772c4e9aa952d9899d58d93264 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 19/23] Display all traffic over Tor +Subject: [PATCH 19/24] Display all traffic over Tor --- im/content/accountWizard.xul | 2 ++ diff --git a/projects/instantbird/0020-Trac-17480-Content-sink.patch b/projects/instantbird/0020-Trac-17480-Content-sink.patch index 47c8e37..7c7d911 100644 --- a/projects/instantbird/0020-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0020-Trac-17480-Content-sink.patch @@ -1,7 +1,7 @@ From 7512783d8cbcd15c9b0c2bfd07fbf4c2ff628f6e 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 20/23] Trac 17480: Content sink +Subject: [PATCH 20/24] Trac 17480: Content sink --- chat/modules/imContentSink.jsm | 30 +++++------------------------- diff --git a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch index 43d0546..5fd96c5 100644 --- a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,7 +1,7 @@ From d6b9d9b02c72f979a8a01eef2bd6c358dfc5394b 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 21/23] SASL ECDSA-NIST256P-CHALLENGE +Subject: [PATCH 21/24] SASL ECDSA-NIST256P-CHALLENGE --- chat/components/src/imAccounts.js | 1 + diff --git a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch index 7064a26..df7305a 100644 --- a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch +++ b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch @@ -1,7 +1,7 @@ From 6c0d0db66b8375dd63a1f7bfe1661c8956f6d6cb Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Wed, 26 Oct 2016 20:16:58 +0200 -Subject: [PATCH 22/23] Bug 1313137 - "msg is not defined" error in +Subject: [PATCH 22/24] Bug 1313137 - "msg is not defined" error in irc.js:changeBuddyNick. r=clokep --HG-- diff --git a/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch index c0ee26e..4131428 100644 --- a/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch +++ b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch @@ -1,7 +1,7 @@ From b55560a8e94434e8320e428145f9d93ca494ce04 Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Thu, 12 May 2016 15:10:43 +0200 -Subject: [PATCH 23/23] Bug 954368 - Contact list entries should adapt their +Subject: [PATCH 23/24] Bug 954368 - Contact list entries should adapt their height to the actual font size. r=florian --HG-- diff --git a/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch b/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch new file mode 100644 index 0000000..db8d41b --- /dev/null +++ b/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch @@ -0,0 +1,25 @@ +From aae841a7013929d5ba53e379de0d8b9b947d3789 Mon Sep 17 00:00:00 2001 +From: Arlo Breault <arlolra(a)gmail.com> +Date: Sat, 5 Nov 2016 14:55:20 -0700 +Subject: [PATCH 24/24] Bug 1187281 - Only show "close" button on Windows + +--- + im/content/accounts.xul | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/im/content/accounts.xul b/im/content/accounts.xul +index f3f1c6b..d683562 100644 +--- a/im/content/accounts.xul ++++ b/im/content/accounts.xul +@@ -142,6 +142,8 @@ + <windowdragbox id="bottombuttons" align="center"> + <button id="newaccount" command="cmd_new"/> + <spacer flex="1"/> ++#ifdef XP_WIN + <button id="close" command="cmd_close"/> ++#endif + </windowdragbox> + </window> +-- +2.10.2 + diff --git a/projects/instantbird/config b/projects/instantbird/config index 9a95eae..eedc112 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -85,6 +85,7 @@ input_files: - filename: 0021-SASL-ECDSA-NIST256P-CHALLENGE.patch - filename: 0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch - filename: 0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch + - filename: 0024-Bug-1187281-Only-show-close-button-on-Windows.patch - filename: mozconfig-common - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig

1 0

[tor-messenger-build/master] Trac 16491: Contact list entries don't adapt to the actual font size
by arlo＠torproject.org 05 Nov '16

05 Nov '16

commit 3475b6f0a9415708ca4a2b849ff9cb0b0c44385a Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Nov 5 12:02:48 2016 -0700 Trac 16491: Contact list entries don't adapt to the actual font size --- ChangeLog | 1 + .../0001-Set-Tor-Messenger-preferences.patch | 2 +- ...0002-Trac-16489-Prevent-account-autologin.patch | 2 +- ...Support-Special-Characters-input-prompt-o.patch | 2 +- ...Better-error-reporting-for-failed-outgoin.patch | 2 +- .../0005-Trac-13312-OTR-over-Twitter-DMs.patch | 2 +- ...-Fix-tab-strip-background-colour-on-OS-X..patch | 2 +- ...-XMPP-createConversation-should-handle-in.patch | 2 +- ...-Set-_userVCard-own-property-when-downloa.patch | 2 +- .../0009-XMPP-in-band-registration.patch | 2 +- .../instantbird/0010-Remove-search-from-UI.patch | 2 +- .../0011-Add-Tor-Messenger-branding.patch | 2 +- projects/instantbird/0012-Account-picture.patch | 2 +- .../0013-Modify-protocol-defaults.patch | 2 +- .../instantbird/0014-Modify-IRC-defaults.patch | 2 +- projects/instantbird/0015-Modify-themes.patch | 2 +- .../instantbird/0016-Modify-XMPP-defaults.patch | 2 +- projects/instantbird/0017-Remove-logging-UI.patch | 2 +- projects/instantbird/0018-Cert-override.patch | 2 +- .../0019-Display-all-traffic-over-Tor.patch | 2 +- .../instantbird/0020-Trac-17480-Content-sink.patch | 2 +- .../0021-SASL-ECDSA-NIST256P-CHALLENGE.patch | 2 +- ...-msg-is-not-defined-error-in-irc.js-chang.patch | 2 +- ...Contact-list-entries-should-adapt-their-h.patch | 322 +++++++++++++++++++++ projects/instantbird/config | 1 + 25 files changed, 346 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index c8fb3ae..3257cf8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ Tor Messenger 0.3.0b1 -- * Use the tor-browser-45.4.0esr-6.0-1 branch (41f1c54a) on tor-browser * Use the THUNDERBIRD_45_4_0_RELEASE tag on comm-esr45 * Update ctypes-otr to 00e4e80a + * Trac 16491: Contact list entries don't adapt to the actual font size * Trac 16536: Investigate Tor Browser patches relevant to Tor Messenger * Trac 17471: Investigate Tor Browser preferences relevant to Tor Messenger * Trac 17480: Make url linkification toggleable diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index edd6951..d485eec 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,7 +1,7 @@ From b229ec3ed7af7f4e78b1d75a26c1ed76046ad3fe Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:48:41 -0700 -Subject: [PATCH 01/22] Set Tor Messenger preferences +Subject: [PATCH 01/23] Set Tor Messenger preferences --- im/app/profile/all-instantbird.js | 399 ++++++++++++++++++++++++++++++++++++-- diff --git a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch index 33be92a..96a0b5a 100644 --- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch +++ b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch @@ -1,7 +1,7 @@ From facec2ac69b9068c63278572ffdfa432f259f373 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 16489: Prevent account autologin +Subject: [PATCH 02/23] Trac 16489: Prevent account autologin --- chat/components/src/imAccounts.js | 2 +- diff --git a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch index 9b9417f..7702b9f 100644 --- a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch +++ b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch @@ -1,7 +1,7 @@ From e8cbcbe0aab97d75fec3abe65b575f3e814e7837 Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Sat, 30 Jan 2016 20:56:38 +0100 -Subject: [PATCH 03/22] Trac 17896: Support "Special Characters" input prompt +Subject: [PATCH 03/23] Trac 17896: Support "Special Characters" input prompt on OS X * Bug 1151784 - Add Edit menu to the conversation window on OS X. r=nhnt11,florian diff --git a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch index 93eb82f..9aa4468 100644 --- a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch +++ b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch @@ -1,7 +1,7 @@ From 922480805c668eecb6edbbda2b2a4dfb61107144 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 2 Feb 2016 16:04:51 -0800 -Subject: [PATCH 04/22] Trac 17494: Better error reporting for failed outgoing +Subject: [PATCH 04/23] Trac 17494: Better error reporting for failed outgoing messages * Bug 1245325 - Better error reporting for failed outgoing messages. r=clokep diff --git a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch index 83a4ddd..ba27e8c 100644 --- a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch +++ b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch @@ -1,7 +1,7 @@ From 6990be2c6ac257be6f8aa284814489be2c6f25ea Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 15 Mar 2016 17:40:42 -0700 -Subject: [PATCH 05/22] Trac 13312: OTR over Twitter DMs +Subject: [PATCH 05/23] Trac 13312: OTR over Twitter DMs --- chat/components/src/imConversations.js | 4 +- diff --git a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch index fd8e394..dce21df 100644 --- a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch +++ b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch @@ -1,7 +1,7 @@ From ef854ddec3ec3f62d612484d7099e461fe18d128 Mon Sep 17 00:00:00 2001 From: Nihanth Subramanya <nhnt11(a)gmail.com> Date: Sun, 9 Oct 2016 21:53:04 -0700 -Subject: [PATCH 06/22] Bug 1218193 - Fix tab strip background colour on OS X. +Subject: [PATCH 06/23] Bug 1218193 - Fix tab strip background colour on OS X. r=aleth --- diff --git a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch index 01da37e..2e7f702 100644 --- a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch +++ b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch @@ -1,7 +1,7 @@ From a60538df8166c6eb8e267ac92598706c25ff35f8 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 9 Oct 2016 21:57:07 -0700 -Subject: [PATCH 07/22] Bug 1246431 - XMPP createConversation should handle +Subject: [PATCH 07/23] Bug 1246431 - XMPP createConversation should handle incoming messages from the server properly. r=aleth --- diff --git a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch index bc5194a..fb53f3c 100644 --- a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch +++ b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch @@ -1,7 +1,7 @@ From 2ed57a22907efdee880b30d956391d52417b01a6 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 28 Aug 2016 08:57:41 -0700 -Subject: [PATCH 08/22] Bug 1298574 - Set _userVCard own property when +Subject: [PATCH 08/23] Bug 1298574 - Set _userVCard own property when downloading vCard fails. r=aleth * This prevents an infinite req / res cycle. diff --git a/projects/instantbird/0009-XMPP-in-band-registration.patch b/projects/instantbird/0009-XMPP-in-band-registration.patch index db258da..cfa567c 100644 --- a/projects/instantbird/0009-XMPP-in-band-registration.patch +++ b/projects/instantbird/0009-XMPP-in-band-registration.patch @@ -1,7 +1,7 @@ From d28b2c39b8f9249490dc6499d831e6e6adbe838a Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:42:25 -0700 -Subject: [PATCH 09/22] XMPP in-band registration +Subject: [PATCH 09/23] XMPP in-band registration --- chat/locales/en-US/xmpp.properties | 5 + diff --git a/projects/instantbird/0010-Remove-search-from-UI.patch b/projects/instantbird/0010-Remove-search-from-UI.patch index fe91747..26555bc 100644 --- a/projects/instantbird/0010-Remove-search-from-UI.patch +++ b/projects/instantbird/0010-Remove-search-from-UI.patch @@ -1,7 +1,7 @@ From 33ec527a5ba77bbe3af57666c9a25b54d2d97512 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 10/22] Remove search from UI +Subject: [PATCH 10/23] Remove search from UI --- im/content/nsContextMenu.js | 18 +----------------- diff --git a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch index 6b0847f..7245db5 100644 --- a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch @@ -1,7 +1,7 @@ From 41c60f97c6049e4e3bc130fa963616e9ddc77af6 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:56:27 -0700 -Subject: [PATCH 11/22] Add Tor Messenger branding +Subject: [PATCH 11/23] Add Tor Messenger branding --- im/app/macbuild/Contents/Info.plist.in | 2 +- diff --git a/projects/instantbird/0012-Account-picture.patch b/projects/instantbird/0012-Account-picture.patch index be7c944..5e7abb8 100644 --- a/projects/instantbird/0012-Account-picture.patch +++ b/projects/instantbird/0012-Account-picture.patch @@ -1,7 +1,7 @@ From 65de52be6fbf68084231270ec14c84f225ed0fed 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 12/22] Account picture +Subject: [PATCH 12/23] Account picture --- im/content/blist.xul | 3 +-- diff --git a/projects/instantbird/0013-Modify-protocol-defaults.patch b/projects/instantbird/0013-Modify-protocol-defaults.patch index 363c197..3e5cd3a 100644 --- a/projects/instantbird/0013-Modify-protocol-defaults.patch +++ b/projects/instantbird/0013-Modify-protocol-defaults.patch @@ -1,7 +1,7 @@ From 8dd9a15845160e182b8ca44e6f4d07fdd59ffed0 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:25:34 -0700 -Subject: [PATCH 13/22] Modify protocol defaults +Subject: [PATCH 13/23] Modify protocol defaults * Top protocols diff --git a/projects/instantbird/0014-Modify-IRC-defaults.patch b/projects/instantbird/0014-Modify-IRC-defaults.patch index 3543d97..83667ef 100644 --- a/projects/instantbird/0014-Modify-IRC-defaults.patch +++ b/projects/instantbird/0014-Modify-IRC-defaults.patch @@ -1,7 +1,7 @@ From ac449194473c8d254672c653b73f66350e665cc8 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 14/22] Modify IRC defaults +Subject: [PATCH 14/23] Modify IRC defaults * ctcp ping diff --git a/projects/instantbird/0015-Modify-themes.patch b/projects/instantbird/0015-Modify-themes.patch index e70f9aa..47a8d62 100644 --- a/projects/instantbird/0015-Modify-themes.patch +++ b/projects/instantbird/0015-Modify-themes.patch @@ -1,7 +1,7 @@ From 38fbe7232753738d91ce12c4df53fe83a3192e16 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 15/22] Modify themes +Subject: [PATCH 15/23] Modify themes * theme extension updateh diff --git a/projects/instantbird/0016-Modify-XMPP-defaults.patch b/projects/instantbird/0016-Modify-XMPP-defaults.patch index b91f9f4..42e07c6 100644 --- a/projects/instantbird/0016-Modify-XMPP-defaults.patch +++ b/projects/instantbird/0016-Modify-XMPP-defaults.patch @@ -1,7 +1,7 @@ From 64746206241b088e2a609662fcbe0edc3baad88b Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:38:49 -0700 -Subject: [PATCH 16/22] Modify XMPP defaults +Subject: [PATCH 16/23] Modify XMPP defaults * xmpp-default-domain diff --git a/projects/instantbird/0017-Remove-logging-UI.patch b/projects/instantbird/0017-Remove-logging-UI.patch index 802dfe8..83c6c6c 100644 --- a/projects/instantbird/0017-Remove-logging-UI.patch +++ b/projects/instantbird/0017-Remove-logging-UI.patch @@ -1,7 +1,7 @@ From 47bb9db3798b59d066399ec289295229a1aa4168 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 17/22] Remove logging UI +Subject: [PATCH 17/23] Remove logging UI --- im/content/preferences/privacy.xul | 20 -------------------- diff --git a/projects/instantbird/0018-Cert-override.patch b/projects/instantbird/0018-Cert-override.patch index ffd1fd2..f7c0f5a 100644 --- a/projects/instantbird/0018-Cert-override.patch +++ b/projects/instantbird/0018-Cert-override.patch @@ -1,7 +1,7 @@ From 9ded93b407e23a54bd335d273d31496bc426ffd1 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 18/22] Cert override +Subject: [PATCH 18/23] Cert override --- im/app/profile/cert_override.txt | 3 +++ diff --git a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch index 41a87c1..c8d5779 100644 --- a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch @@ -1,7 +1,7 @@ From 119c059b638fcb772c4e9aa952d9899d58d93264 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 19/22] Display all traffic over Tor +Subject: [PATCH 19/23] Display all traffic over Tor --- im/content/accountWizard.xul | 2 ++ diff --git a/projects/instantbird/0020-Trac-17480-Content-sink.patch b/projects/instantbird/0020-Trac-17480-Content-sink.patch index 723330d..47c8e37 100644 --- a/projects/instantbird/0020-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0020-Trac-17480-Content-sink.patch @@ -1,7 +1,7 @@ From 7512783d8cbcd15c9b0c2bfd07fbf4c2ff628f6e 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 20/22] Trac 17480: Content sink +Subject: [PATCH 20/23] Trac 17480: Content sink --- chat/modules/imContentSink.jsm | 30 +++++------------------------- diff --git a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch index 5a16f93..43d0546 100644 --- a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,7 +1,7 @@ From d6b9d9b02c72f979a8a01eef2bd6c358dfc5394b 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 21/22] SASL ECDSA-NIST256P-CHALLENGE +Subject: [PATCH 21/23] SASL ECDSA-NIST256P-CHALLENGE --- chat/components/src/imAccounts.js | 1 + diff --git a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch index 56a638e..7064a26 100644 --- a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch +++ b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch @@ -1,7 +1,7 @@ From 6c0d0db66b8375dd63a1f7bfe1661c8956f6d6cb Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Wed, 26 Oct 2016 20:16:58 +0200 -Subject: [PATCH 22/22] Bug 1313137 - "msg is not defined" error in +Subject: [PATCH 22/23] Bug 1313137 - "msg is not defined" error in irc.js:changeBuddyNick. r=clokep --HG-- diff --git a/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch new file mode 100644 index 0000000..c0ee26e --- /dev/null +++ b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch @@ -0,0 +1,322 @@ +From b55560a8e94434e8320e428145f9d93ca494ce04 Mon Sep 17 00:00:00 2001 +From: aleth <aleth(a)instantbird.org> +Date: Thu, 12 May 2016 15:10:43 +0200 +Subject: [PATCH 23/23] Bug 954368 - Contact list entries should adapt their + height to the actual font size. r=florian + +--HG-- +extra : rebase_source : 9820f3a68794f98260f3ac406772da6d176d02ec +--- + chat/themes/imtooltip.css | 1 + + im/content/blist.css | 38 ++++++++++++--- + im/content/blist.js | 7 +++ + im/content/blist.xul | 4 ++ + im/content/contact.xml | 57 +++++++++++----------- + im/content/conv.xml | 10 ++-- + .../en-US/chrome/instantbird/instantbird.dtd | 6 +++ + im/themes/blist.css | 22 ++++----- + 8 files changed, 92 insertions(+), 53 deletions(-) + +diff --git a/chat/themes/imtooltip.css b/chat/themes/imtooltip.css +index c4525be..630da39 100644 +--- a/chat/themes/imtooltip.css ++++ b/chat/themes/imtooltip.css +@@ -31,6 +31,7 @@ + + .tooltipBuddies { + margin-left: -3px; ++ --blist-item-height: 20px; /* 16px icon plus padding */ + } + + .tooltipDisplayName { +diff --git a/im/content/blist.css b/im/content/blist.css +index d47e4f3..15b61b1 100644 +--- a/im/content/blist.css ++++ b/im/content/blist.css +@@ -30,15 +30,28 @@ group { + -moz-box-align: center; + } + +-/* The height is required for the animation to work. The skin can +- * specify an additionnal min-height value if there are things of +- * constant size (icons + padding) */ +-contact, +-buddy, ++/* The height is required for the animation to work. */ + group { + height: 1em; + } + ++conv, ++contact, ++buddy { ++ /* Variable set from blist.js. This is necessary as CSS transitions don't ++ work with height: auto. ++ Usually 16+2+2px for the protocol icon, padding top and bottom. */ ++ height: var(--blist-item-height); ++} ++ ++contact[open], ++contact[aliasing], ++#buddylistbox:focus > contact[selected] { ++ /* This is fine because height transitions in this state are on the ++ buddies, and there is no transition on selection (it's instant). */ ++ height: auto; ++} ++ + /* Possible values of the |state| attribute: + - not set: the binding is not initialized yet, + - showing: during the expand animation, +@@ -51,23 +64,24 @@ contact:not([state]), + buddy:not([state]) { + height: 0; + } ++ + contact[state="showing"], + buddy[state="showing"] { + /* Should match the transition effect for contact/buddy collapsing so + that reordering doesn't make the whole list jump. */ +- -moz-transition: height .2s ease-in; ++ transition: height .2s ease-in; + } + + contact[state="fading"] { + opacity: 0; +- -moz-transition: opacity .4s ease-in 1s; ++ transition: opacity .4s ease-in 1s; + } + + contact[state="collapsing"], + buddy[state="collapsing"], + group[collapsing="true"] { + height: 0; +- -moz-transition: height .2s ease-in; ++ transition: height .2s ease-in; + } + + contact[state="collapsing"] *, +@@ -78,6 +92,14 @@ group[collapsing="true"] * { + display: none; + } + ++#dummyContact { ++ height: auto; ++} ++ ++#dummylistbox { ++ visibility: hidden; ++} ++ + tooltip[type="im"] { + -moz-binding: url("chrome://chat/content/imtooltip.xml#tooltip"); + } +diff --git a/im/content/blist.js b/im/content/blist.js +index 9ec10e2..ce76ffc 100644 +--- a/im/content/blist.js ++++ b/im/content/blist.js +@@ -820,6 +820,13 @@ var buddyList = { + .setAttribute("checked", "true"); + } + ++ // Find the correct height of a contact list item. This can vary depending ++ // on the platform font and font size. ++ let dummyContact = document.getElementById("dummyContact"); ++ let contactHeight = dummyContact.getBoundingClientRect().height; ++ document.getElementById("buddyListMsg") ++ .style.setProperty("--blist-item-height", contactHeight + "px"); ++ + let blistBox = document.getElementById("buddylistbox"); + blistBox.removeGroup = function(aGroupElt) { + let index = buddyList._displayedGroups.indexOf(aGroupElt); +diff --git a/im/content/blist.xul b/im/content/blist.xul +index f29a48b..71ee2c9 100644 +--- a/im/content/blist.xul ++++ b/im/content/blist.xul +@@ -224,6 +224,10 @@ + onfocus="buddyList.buddylistboxFocus();" + onselect="buddyList.listboxSelect(event);" + tooltip="imTooltip"/> ++ <richlistbox id="dummylistbox"> ++ <contact id="dummyContact" displayname="&dummyContact.label;" ++ state="visible" status="unknown"/> ++ </richlistbox> + <spacer id="listSpacer" flex="1" + onclick='document.getElementById("buddylistbox").focus();'/> + </notificationbox> +diff --git a/im/content/contact.xml b/im/content/contact.xml +index 5fc36dd..f2b4641 100644 +--- a/im/content/contact.xml ++++ b/im/content/contact.xml +@@ -16,11 +16,11 @@ + + <binding id="contact" extends="chrome://global/content/bindings/richlistbox.xml#richlistitem"> + <content> +- <xul:stack class="prplBuddyIcon" mousethrough="always"> +- <xul:image class="protoIcon" xbl:inherits="src=iconPrpl,status"/> +- <xul:image class="statusIcon" xbl:inherits="status"/> +- </xul:stack> +- <xul:hbox flex="1" class="contact-hbox" mousethrough="always"> ++ <xul:hbox flex="1" class="contact-hbox" mousethrough="always" align="center"> ++ <xul:stack class="prplBuddyIcon" mousethrough="always"> ++ <xul:image class="protoIcon" xbl:inherits="src=iconPrpl,status"/> ++ <xul:image class="statusIcon" xbl:inherits="status"/> ++ </xul:stack> + <xul:label crop="end" flex="1" mousethrough="always" + anonid="displayname" class="contactDisplayName blistDisplayName" + xbl:inherits="value=displayname,status"/> +@@ -529,30 +529,29 @@ + + <binding id="contact-big" extends="chrome://instantbird/content/contact.xml#contact"> + <content> +- <xul:hbox flex="1" mousethrough="always"> +- <xul:stack class="prplBuddyIcon" mousethrough="always"> +- <xul:image class="protoIcon" xbl:inherits="src=iconPrpl,status"/> +- <xul:image class="statusIcon" xbl:inherits="status"/> +- </xul:stack> +- <xul:vbox flex="1" class="contact-vbox" mousethrough="always"> +- <xul:hbox class="contact-hbox" mousethrough="always"> +- <xul:label crop="end" flex="1" mousethrough="always" +- anonid="displayname" class="contactDisplayName blistDisplayName" +- xbl:inherits="value=displayname,status"/> +- <xul:button anonid="startChatBubble" class="startChatBubble" +- tooltiptext="&openConversationCmd.label;"/> +- </xul:hbox> +- <xul:hbox class="contact-hbox" mousethrough="always"> +- <xul:label crop="end" flex="1" mousethrough="always" +- anonid="statusText" class="contactStatusText" +- xbl:inherits="value=statusText"/> +- <xul:button anonid="expander" class="expander-down" +- tooltiptextexpand="&expandContactTooltip;" +- tooltiptextcollapse="&collapseContactTooltip;" +- tooltiptext="&expandContactTooltip;"/> +- </xul:hbox> +- </xul:vbox> +- </xul:hbox> ++ <xul:vbox flex="1" class="contact-vbox" mousethrough="always"> ++ <xul:hbox flex="1" class="contact-hbox" mousethrough="always" align="center"> ++ <xul:stack class="prplBuddyIcon" mousethrough="always"> ++ <xul:image class="protoIcon" xbl:inherits="src=iconPrpl,status"/> ++ <xul:image class="statusIcon" xbl:inherits="status"/> ++ </xul:stack> ++ <xul:label crop="end" flex="1" mousethrough="always" ++ anonid="displayname" class="contactDisplayName blistDisplayName" ++ xbl:inherits="value=displayname,status"/> ++ <xul:button anonid="startChatBubble" class="startChatBubble" ++ tooltiptext="&openConversationCmd.label;"/> ++ </xul:hbox> ++ ++ <xul:hbox flex="1" class="contact-hbox" mousethrough="always" align="center"> ++ <xul:label crop="end" flex="1" mousethrough="always" ++ anonid="statusText" class="contactStatusText contactIconSpace" ++ xbl:inherits="value=statusText"/> ++ <xul:button anonid="expander" class="expander-down" ++ tooltiptextexpand="&expandContactTooltip;" ++ tooltiptextcollapse="&collapseContactTooltip;" ++ tooltiptext="&expandContactTooltip;"/> ++ </xul:hbox> ++ </xul:vbox> + <xul:vbox anonid="contactBuddies" class="contactBuddies"> + <children/> + </xul:vbox> +diff --git a/im/content/conv.xml b/im/content/conv.xml +index 96a33af..c41da6f 100644 +--- a/im/content/conv.xml ++++ b/im/content/conv.xml +@@ -16,11 +16,11 @@ + + <binding id="conv" extends="chrome://global/content/bindings/richlistbox.xml#richlistitem"> + <content> +- <xul:stack class="prplBuddyIcon" mousethrough="always"> +- <xul:image class="protoIcon" xbl:inherits="src=iconPrpl,status"/> +- <xul:image class="statusIcon" xbl:inherits="status"/> +- </xul:stack> +- <xul:hbox flex="1" class="conv-hbox" mousethrough="always"> ++ <xul:hbox flex="1" class="conv-hbox" mousethrough="always" align="center"> ++ <xul:stack class="prplBuddyIcon" mousethrough="always"> ++ <xul:image class="protoIcon" xbl:inherits="src=iconPrpl,status"/> ++ <xul:image class="statusIcon" xbl:inherits="status"/> ++ </xul:stack> + <xul:label crop="end" flex="1" mousethrough="always" + anonid="displayname" class="convDisplayName blistDisplayName" + xbl:inherits="value=displayname,status"/> +diff --git a/im/locales/en-US/chrome/instantbird/instantbird.dtd b/im/locales/en-US/chrome/instantbird/instantbird.dtd +index 80b8948..fce965b 100644 +--- a/im/locales/en-US/chrome/instantbird/instantbird.dtd ++++ b/im/locales/en-US/chrome/instantbird/instantbird.dtd +@@ -95,6 +95,12 @@ + <!ENTITY userIcon.label "Change your icon"> + <!ENTITY contactsHeader.label "Contacts"> + <!ENTITY convsHeader.label "Conversations on hold"> ++ ++<!ENTITY dummyContact.label "SgFyWp"> + + <!ENTITY openConversationCmd.label "Start a conversation"> + <!ENTITY openConversationCmd.accesskey "c"> +diff --git a/im/themes/blist.css b/im/themes/blist.css +index 9922674..c033b51 100644 +--- a/im/themes/blist.css ++++ b/im/themes/blist.css +@@ -100,14 +100,7 @@ group { + padding: 0 2px; + } + +-conv, +-contact, +-buddy { +- height: 20px; /* 16+2+2px for the protocol icon, padding top and bottom */ +-} +- + /* The vertical padding directly on the binding would not be animated. */ +-.prplBuddyIcon, + group>* { + padding-top: 2px; + padding-bottom: 2px; +@@ -153,21 +146,28 @@ contact[droptarget] > buddy[dummy] { + margin: 0; + } + ++.contactDisplayName, + .buddyDisplayName { + -moz-margin-start: 2px; + } + ++/* Used for the second line of a contact-big to add space on the left ++ where the .prplBuddyIcon sits on the first line. */ ++.contactIconSpace { ++ /* .prplBuddyIcon width+margins (16+3+3) + .contactStatusText margin (2) */ ++ margin-inline-start: 24px; ++} ++ + .contact-hbox, + .conv-hbox { + margin: 2px 0; +- -moz-margin-start: 2px; + min-height: 16px; + overflow-x: hidden; + } + + /* Avoid a strange jumping bug when hovering and the startChatBubble appears */ + .contact-vbox { +- min-height: 40px; ++ min-height: calc(var(--blist-item-height) * 2); + } + + .hideGroupButton, +@@ -240,8 +240,8 @@ contact[droptarget] > buddy[dummy] { + .startChatBubble, + .expander-up, + .expander-down { +- width: 16px; +- height: 16px; ++ max-width: 16px; ++ max-height: 16px; + min-height: 16px; + min-width: 16px; + } +-- +2.10.2 + diff --git a/projects/instantbird/config b/projects/instantbird/config index 238042f..9a95eae 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -84,6 +84,7 @@ input_files: - filename: 0020-Trac-17480-Content-sink.patch - filename: 0021-SASL-ECDSA-NIST256P-CHALLENGE.patch - filename: 0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch + - filename: 0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch - filename: mozconfig-common - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig

1 0

[tor-messenger-build/master] Trac 17471: Review Tor Browser preferences
by arlo＠torproject.org 05 Nov '16

05 Nov '16

commit dbf84f58f53d363937c0ec5bbc0c77ccc6c38d3d Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Nov 5 09:26:40 2016 -0700 Trac 17471: Review Tor Browser preferences --- ChangeLog | 16 +- .../0001-Set-Tor-Messenger-preferences.patch | 443 +++++++++++++++++---- ...0002-Trac-16489-Prevent-account-autologin.patch | 2 +- ...Support-Special-Characters-input-prompt-o.patch | 2 +- ...Better-error-reporting-for-failed-outgoin.patch | 2 +- .../0005-Trac-13312-OTR-over-Twitter-DMs.patch | 2 +- ...-Fix-tab-strip-background-colour-on-OS-X..patch | 2 +- ...-XMPP-createConversation-should-handle-in.patch | 2 +- ...-Set-_userVCard-own-property-when-downloa.patch | 2 +- .../0009-XMPP-in-band-registration.patch | 2 +- .../instantbird/0010-Remove-search-from-UI.patch | 2 +- .../0011-Add-Tor-Messenger-branding.patch | 2 +- projects/instantbird/0012-Account-picture.patch | 2 +- .../0013-Modify-protocol-defaults.patch | 2 +- .../instantbird/0014-Modify-IRC-defaults.patch | 2 +- projects/instantbird/0015-Modify-themes.patch | 2 +- .../instantbird/0016-Modify-XMPP-defaults.patch | 2 +- projects/instantbird/0017-Remove-logging-UI.patch | 2 +- projects/instantbird/0018-Cert-override.patch | 2 +- .../0019-Display-all-traffic-over-Tor.patch | 2 +- .../instantbird/0020-Trac-17480-Content-sink.patch | 2 +- .../0021-SASL-ECDSA-NIST256P-CHALLENGE.patch | 2 +- ...-msg-is-not-defined-error-in-irc.js-chang.patch | 2 +- 23 files changed, 399 insertions(+), 102 deletions(-) diff --git a/ChangeLog b/ChangeLog index b6dc6b4..c8fb3ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,18 +1,20 @@ Tor Messenger 0.3.0b1 -- * All Platforms - * Use the tor-browser-45.4.0esr-6.0-1 branch on tor-browser + * Use the tor-browser-45.4.0esr-6.0-1 branch (41f1c54a) on tor-browser * Use the THUNDERBIRD_45_4_0_RELEASE tag on comm-esr45 + * Update ctypes-otr to 00e4e80a * Trac 16536: Investigate Tor Browser patches relevant to Tor Messenger - * Trac 20208: Put conversations on hold by default - * Properly handle incoming xmpp server messages (bugzilla 1246431) - * Trac 20276: Fix toggling sounds + * Trac 17471: Investigate Tor Browser preferences relevant to Tor Messenger * Trac 17480: Make url linkification toggleable - * Update ctypes-otr to 00e4e80a + * Trac 19816: Build process should generate mar files + * Trac 20208: Put conversations on hold by default * Trac 20231: Remove incomplete translations - * Fix irc "msg is not defined" error (bugzilla 1313137) + * Trac 20276: Fix toggling sounds + * Bugzilla 1246431: Properly handle incoming xmpp server messages + * Bugzilla 1313137: Fix irc "msg is not defined" error * Mac - * Trac 20206: Avoid prompting to download font "Osaka" on macOS Sierra * Trac 20204: Windows don't drag on macOS Sierra + * Trac 20206: Avoid prompting to download font "Osaka" on macOS Sierra * Windows * Trac 20062: Make stripping signatures reproducible on TM .exe files diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index a99fa26..edd6951 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,17 +1,64 @@ -From bfa4576ff8e6291a0cd293e05ac48b2a91c6a3c1 Mon Sep 17 00:00:00 2001 +From b229ec3ed7af7f4e78b1d75a26c1ed76046ad3fe Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:48:41 -0700 Subject: [PATCH 01/22] Set Tor Messenger preferences --- - im/app/profile/all-instantbird.js | 110 +++++++++++++++++++++++++++++++------- - 1 file changed, 90 insertions(+), 20 deletions(-) + im/app/profile/all-instantbird.js | 399 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 378 insertions(+), 21 deletions(-) diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index b7a3970..eb1423f 100644 +index b7a3970..a4e0654 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js -@@ -28,7 +28,7 @@ pref("general.autoScroll", true); +@@ -1,3 +1,46 @@ ++/** ++ * This file is divded into three section, ++ * ++ * 1) Tor Messenger prefs, not found in the next two sections; ++ * 2) The original Instantbird prefs found here, modified by TM; ++ * 3) Tor Browser's 000-tor-browser.js, modified by TM or commented out when ++ * duplicating a previously declared pref. ++ * ++ * The idea being that to update this file when rebasing, we'd just paste the ++ * full contents of those files over the corresponding sections and then look ++ * at the diffs. ++ */ ++ ++ ++ ++// Disable all logging ++pref("purple.logging.log_chats", false); ++pref("purple.logging.log_ims", false); ++pref("purple.logging.log_system", false); ++ ++// Disable typing notifications ++pref("purple.conversations.im.send_typing", false); ++ ++// Do not report idle status or the away message ++pref("messenger.status.awayWhenIdle", false); ++pref("messenger.status.defaultIdleAwayMessage", ""); ++pref("messenger.status.reportIdle", false); ++ ++// Do not send the message format (fonts, colors) ++pref("messenger.conversations.sendFormat", false); ++ ++// Disable text formatting (remove the tags) ++pref("messenger.options.filterMode", 0); ++ ++// Put conversations on hold so that OTR disconnect is not sent. See #20208. ++pref("messenger.conversations.holdByDefault", true); ++ ++// No AUS check for system add-on updates for Tor Browser users. ++// This pref is taken from the TB diff of browser/app/profile/firefox.js ++pref("extensions.systemAddon.update.url", ""); ++ ++ ++ + /* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +@@ -28,7 +71,7 @@ pref("general.autoScroll", true); // 0 = spellcheck nothing // 1 = check multi-line controls [default] // 2 = check multi/single line controls @@ -20,7 +67,7 @@ index b7a3970..eb1423f 100644 pref("messenger.accounts.convertOldPasswords", true); pref("messenger.accounts.promptOnDelete", true); -@@ -66,7 +66,7 @@ pref("extensions.mintrayr.singleClickRestore", false); +@@ -66,7 +109,7 @@ pref("extensions.mintrayr.singleClickRestore", false); // Whether message related sounds should be played at all. If this is enabled // then the more specific prefs are checked as well. @@ -29,17 +76,12 @@ index b7a3970..eb1423f 100644 // Specifies whether each message event should trigger a sound for incoming // and outgoing messages, or when your nickname is mentioned in a chat. pref("messenger.options.playSounds.outgoing", true); -@@ -142,26 +142,28 @@ pref("app.update.staging.enabled", true); +@@ -142,26 +185,23 @@ pref("app.update.staging.enabled", true); // Update service URL: // You do not need to use all the %VAR% parameters. Use what you need, %PRODUCT%,%VERSION%,%BUILD_ID%,%CHANNEL% for example -pref("app.update.url", "https://update.instantbird.org/1/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARG…"); +pref("app.update.url", "https://aus2.torproject.org/tormessenger/update_2/%CHANNEL%/%BUILD_TARGET%/…"); -+ -+#ifdef XP_WIN -+// For now, disable staged updates on Windows (see #18292). -+pref("app.update.staging.enabled", false); -+#endif // URL user can browse to manually if for some reason all update installation // attempts fail. @@ -66,7 +108,7 @@ index b7a3970..eb1423f 100644 // Interval: Time before prompting the user to restart to install the latest // download (in seconds) default=30 minutes -@@ -202,7 +204,7 @@ pref("browser.search.order.1", "chrome://instantbird/locale/regio +@@ -202,7 +242,7 @@ pref("browser.search.order.1", "chrome://instantbird/locale/regio pref("browser.search.order.2", "chrome://instantbird/locale/region.properties"); // send ping to the server to update @@ -75,7 +117,7 @@ index b7a3970..eb1423f 100644 // disable logging for the search service update system by default pref("browser.search.update.log", false); -@@ -222,7 +224,7 @@ pref("extensions.ignoreMTimeChanges", false); +@@ -222,10 +262,10 @@ pref("extensions.ignoreMTimeChanges", false); pref("extensions.logging.enabled", false); pref("general.skins.selectedSkin", "classic/1.0"); @@ -83,8 +125,12 @@ index b7a3970..eb1423f 100644 +pref("extensions.update.enabled", false); pref("extensions.update.interval", 86400); pref("extensions.update.url", "https://addons.instantbird.org/services/update.php?reqVersion=%REQ_VERSION%…"); - pref("extensions.update.autoUpdateDefault", true); -@@ -245,9 +247,9 @@ pref("extensions.getMoreEmoticonsURL", "https://add-ons.instantbird.org/%LOCALE% +-pref("extensions.update.autoUpdateDefault", true); ++pref("extensions.update.autoUpdateDefault", false); + + // Preferences for the Get Add-ons pane + pref("extensions.getAddons.cache.enabled", false); +@@ -245,9 +285,9 @@ pref("extensions.getMoreEmoticonsURL", "https://add-ons.instantbird.org/%LOCALE% pref("extensions.getMoreProtocolsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/protocols/"); // suppress external-load warning for standard browser schemes @@ -97,7 +143,7 @@ index b7a3970..eb1423f 100644 // don't load links inside Instantbird pref("network.protocol-handler.expose-all", false); -@@ -262,10 +264,10 @@ pref("network.protocol-handler.expose.https", true); +@@ -262,10 +302,10 @@ pref("network.protocol-handler.expose.https", true); pref("network.protocol-handler.expose.javascript", true); // 0-Accept, 1-dontAcceptForeign, 2-dontUse @@ -110,7 +156,7 @@ index b7a3970..eb1423f 100644 // We have an Error Console menu item by default so let's display chrome errors pref("javascript.options.showInConsole", true); -@@ -300,14 +302,82 @@ pref("browser.tabs.tabClipWidth", 140); +@@ -300,14 +340,331 @@ pref("browser.tabs.tabClipWidth", 140); // 3 at the end of the tabstrip pref("browser.tabs.closeButtons", 1); @@ -129,73 +175,322 @@ index b7a3970..eb1423f 100644 -pref("statsService.parseLogsForStats", true); +pref("statsService.parseLogsForStats", false); + -+/* Tor Messenger */ -+// Logging -+// Disable all logging -+pref("purple.logging.log_chats", false); -+pref("purple.logging.log_ims", false); -+pref("purple.logging.log_system", false); + -+// Network -+// Use a manual proxy configuration -+pref("network.proxy.type", 1); -+// Empty the "no proxy" setting -+pref("network.proxy.no_proxies_on", ""); -+// Configure Instantbird to use the SOCKS5 proxy ++ ++# Default Preferences ++# Tor Browser Bundle ++# Do not edit this file. ++ ++// Please maintain unit tests at ./tbb-tests/browser_tor_TB4.js ++ ++// Disable initial homepage notifications ++//pref("browser.search.update", false); // TM ++pref("browser.rights.3.shown", true); ++pref("startup.homepage_welcome_url", ""); ++pref("startup.homepage_welcome_url.additional", ""); ++// Not set Windows 10 users would get a special introduction on first start. ++pref("browser.usedOnWindows10", true); ++ ++// Set a generic, default URL that will be opened in a tab after an update. ++// Typically, this will not be used; instead, the <update> element within ++// each update manifest should contain attributes similar to: ++// actions="showURL" ++// openURL="https://blog.torproject.org/tor-browser-55a2-released" ++pref("startup.homepage_override_url", "https://blog.torproject.org/category/tags/tor-browser"); ++ ++// Try to nag a bit more about updates: Pop up a restart dialog an hour after the initial dialog ++pref("app.update.promptWaitTime", 3600); ++pref("app.update.badge", true); ++pref("extensions.hotfix.id", ""); // Bug 16837: Disable hotfix updates as they may cause compat issues ++ ++#ifdef XP_WIN ++// For now, disable staged updates on Windows (see #18292). ++pref("app.update.staging.enabled", false); ++#endif ++ ++// Disable "Slow startup" warnings and associated disk history ++// (bug #13346) ++pref("browser.slowStartup.notificationDisabled", true); ++pref("browser.slowStartup.maxSamples", 0); ++pref("browser.slowStartup.samples", 0); ++ ++// Disable the "Refresh" prompt that is displayed for stale profiles. ++pref("browser.disableResetPrompt", true); ++ ++// Disk activity: Disable Browsing History Storage ++pref("browser.privatebrowsing.autostart", true); ++pref("browser.cache.disk.enable", false); ++pref("browser.cache.offline.enable", false); ++pref("dom.indexedDB.enabled", false); ++pref("permissions.memory_only", true); ++pref("network.cookie.lifetimePolicy", 2); ++pref("browser.download.manager.retention", 1); ++pref("security.nocertdb", false); // TM ++ ++// Disk activity: TBB Directory Isolation ++pref("browser.download.useDownloadDir", false); ++pref("browser.shell.checkDefaultBrowser", false); ++pref("browser.download.manager.addToRecentDocs", false); ++ ++// Misc privacy: Disk ++pref("signon.rememberSignons", false); ++pref("browser.formfill.enable", false); ++pref("signon.autofillForms", false); ++pref("browser.sessionstore.privacy_level", 2); ++pref("media.cache_size", 0); ++ ++// Misc privacy: Remote ++pref("browser.send_pings", false); ++pref("geo.enabled", false); ++pref("geo.wifi.uri", ""); ++pref("browser.search.suggest.enabled", false); ++pref("browser.safebrowsing.enabled", false); ++pref("browser.safebrowsing.malware.enabled", false); ++pref("browser.download.manager.scanWhenDone", false); // prevents AV remote reporting of downloads ++pref("extensions.ui.lastCategory", "addons://list/extension"); ++pref("datareporting.healthreport.service.enabled", false); // Yes, all three of these must be set ++pref("datareporting.healthreport.uploadEnabled", false); ++pref("datareporting.policy.dataSubmissionEnabled", false); ++// Don't fetch a localized remote page that Tor Browser interacts with, see ++// #16727. And, yes, it is "reportUrl" and not "reportURL". ++pref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); ++// Make sure Selfsupport and Unified Telemetry are really disabled, see: #18738. ++pref("datareporting.healthreport.about.reportUrlUnified", "data:text/plain,"); ++pref("browser.selfsupport.enabled", false); ++pref("browser.selfsupport.url", ""); ++pref("toolkit.telemetry.unified", false); ++// Disable the UITour backend so there is no chance that a remote page ++// can use it to confuse Tor Browser users. ++pref("browser.uitour.enabled", false); ++pref("security.mixed_content.block_active_content", false); // Disable until https://bugzilla.mozilla.org/show_bug.cgi?id=878890 is patched ++pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"); // Don't promote sync ++pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers ++pref("services.sync.engine.addons", false); ++pref("services.sync.engine.tabs", false); ++pref("services.sync.ui.hidden", true); ++//pref("extensions.getAddons.cache.enabled", false); // https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/ // TM ++pref("browser.newtabpage.directory.ping", "data:text/plain,"); // Bug 16316 - Avoid potential confusion over tiles for now. ++pref("browser.newtabpage.directory.source", "data:text/plain,"); // Bug 16316 - Avoid potential confusion over tiles for now. ++pref("browser.newtabpage.enhanced", false); // Bug 16316 - Avoid potential confusion over tiles for now. ++pref("browser.newtabpage.introShown", true); // Bug 16316 - Avoid potential confusion over tiles for now. ++pref("browser.newtabpage.preload", false); // Bug 16316 - Avoid potential confusion over tiles for now. ++pref("browser.search.countryCode", "US"); // The next three prefs disable GeoIP search lookups (#16254) ++pref("browser.search.region", "US"); ++pref("browser.search.geoip.url", ""); ++pref("browser.fixup.alternate.enabled", false); // Bug #16783: Prevent .onion fixups ++// Make sure there is no Tracking Protection active in Tor Browser, see: #17898. ++pref("privacy.trackingprotection.pbmode.enabled", false); ++// Disable the Pocket extension (Bug #18886) ++pref("browser.pocket.enabled", false); ++pref("browser.pocket.api", ""); ++pref("browser.pocket.site", ""); ++ ++// Fingerprinting ++pref("webgl.min_capability_mode", true); ++pref("webgl.disable-extensions", true); ++pref("webgl.disable-fail-if-major-performance-caveat", true); ++pref("dom.battery.enabled", false); // fingerprinting due to differing OS implementations ++pref("dom.network.enabled",false); // fingerprinting due to differing OS implementations ++pref("browser.display.max_font_attempts",10); ++pref("browser.display.max_font_count",10); ++pref("gfx.downloadable_fonts.fallback_delay", -1); ++pref("general.appname.override", "Netscape"); ++pref("general.appversion.override", "5.0 (Windows)"); ++pref("general.oscpu.override", "Windows NT 6.1"); ++pref("general.platform.override", "Win32"); ++pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:25.0) Gecko/20100101 Instantbird/1.5"); // TM ++pref("general.productSub.override", "20100101"); ++pref("general.buildID.override", "20100101"); ++pref("browser.startup.homepage_override.buildID", "20100101"); ++pref("general.useragent.vendor", ""); ++pref("general.useragent.vendorSub", ""); ++pref("dom.enable_performance", false); ++pref("plugin.expose_full_path", false); ++pref("browser.zoom.siteSpecific", false); ++pref("intl.charset.default", "windows-1252"); ++pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) ++pref("dom.gamepad.enabled", false); // bugs.torproject.org/13023 ++pref("javascript.use_us_english_locale", true); ++// pref("intl.accept_languages", "en-us, en"); // Set by Torbutton ++// pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton ++// pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton ++// Disable video statistics fingerprinting vector (bug 15757) ++pref("media.video_stats.enabled", false); ++// Disable device sensors as possible fingerprinting vector (bug 15758) ++pref("device.sensors.enabled", false); ++pref("dom.enable_resource_timing", false); // Bug 13024: To hell with this API ++pref("dom.enable_user_timing", false); // Bug 16336: To hell with this API ++pref("privacy.resistFingerprinting", true); ++pref("dom.event.highrestimestamp.enabled", true); // Bug #17046: "Highres" (but truncated) timestamps prevent uptime leaks ++pref("privacy.suppressModifierKeyEvents", true); // Bug #17009: Suppress ALT and SHIFT events" ++pref("ui.use_standins_for_native_colors", true); // https://bugzilla.mozilla.org/232227 ++// Make Reader View users uniform if they really want to use that feature. See ++// bug 18950 for more details. ++pref("browser.reader.detectedFirstArticle", true); ++pref("reader.parse-on-load.enabled", false); ++ ++// Third party stuff ++//pref("network.cookie.cookieBehavior", 1); // TM ++pref("security.enable_tls_session_tickets", false); ++pref("network.http.spdy.enabled", false); // Stores state and may have keepalive issues (both fixable) ++pref("network.http.spdy.enabled.v2", false); // Seems redundant, but just in case ++pref("network.http.spdy.enabled.v3", false); // Seems redundant, but just in case ++pref("network.http.spdy.enabled.v3-1", false); // Seems redundant, but just in case ++pref("privacy.thirdparty.isolate", 0); // Always enforce third party isolation // TM ++pref("network.http.spdy.enabled.http2", false); // Temporarily disabled pending implementation review ++pref("network.http.spdy.enabled.http2draft", false); // Temporarily disabled pending implementation review ++pref("network.predictor.enabled", false); // Temporarily disabled. See https://bugs.torproject.org/16633 ++pref("network.http.altsvc.enabled", false); // Temporarily disabled. See https://bugs.torproject.org/16673 ++pref("network.http.altsvc.oe", false); // Temporarily disabled. See https://bugs.torproject.org/16673 ++ ++// Proxy and proxy security +pref("network.proxy.socks", "127.0.0.1"); -+pref("network.proxy.socks_port", 9152); -+pref("network.proxy.socks_version", 5); -+// Set DNS proxying through SOCKS5 ++pref("network.proxy.socks_port", 9152); // TM ++pref("network.proxy.socks_version", 5); // TM +pref("network.proxy.socks_remote_dns", true); -+// Disable DNS prefetching ++pref("network.proxy.no_proxies_on", ""); // For fingerprinting and local service vulns (#10419) ++pref("network.proxy.type", 1); ++pref("network.security.ports.banned", "9050,9051,9150,9151"); +pref("network.dns.disablePrefetch", true); -+// Disable SPDY -+pref("network.http.spdy.enabled", false); -+// Set the user-agent to Instantbird stable -+pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:25.0) Gecko/20100101 Instantbird/1.5"); -+ -+// Security -+// Disable SSLv3 by setting the minimum supported protocol to TLS 1.0. -+pref("security.tls.version.min", 1); -+// We use the certdb. Necessary for the TB patch, -+// "Bug 14716: HTTP Basic Authentication prompt only displayed once" -+pref("security.nocertdb", false); -+// Disable geolocation -+pref("geo.enabled", false); ++pref("network.protocol-handler.external-default", false); ++pref("network.protocol-handler.external.mailto", false); ++pref("network.protocol-handler.external.news", false); ++pref("network.protocol-handler.external.nntp", false); ++pref("network.protocol-handler.external.snews", false); ++pref("network.protocol-handler.warn-external.mailto", true); ++pref("network.protocol-handler.warn-external.news", true); ++pref("network.protocol-handler.warn-external.nntp", true); ++pref("network.protocol-handler.warn-external.snews", true); ++pref("plugin.disable", true); // Disable to search plugins on first start ++pref("plugins.click_to_play", true); ++pref("plugin.state.flash", 1); ++pref("plugins.hide_infobar_for_missing_plugin", true); ++pref("plugins.hideMissingPluginsNotification", true); ++pref("media.peerconnection.enabled", false); // Disable WebRTC interfaces ++// Disables media devices but only if `media.peerconnection.enabled` is set to ++// `false` as well. (see bug 16328 for this defense-in-depth measure) ++pref("media.navigator.enabled", false); ++// GMPs: We make sure they don't show up on the Add-on panel and confuse users. ++// And the external update/donwload server must not get pinged. We apply a ++// clever solution for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769716. ++pref("media.gmp-provider.enabled", false); ++pref("media.gmp-manager.url.override", "data:text/plain,"); ++// EME prefs: Strictly speaking these prefs don't need to be set as we are ++// using the --disable-eme compile flag. However, in order to not confuse users, ++// who might stumble upon them while looking into about:config, we set them to ++// 'false' communicating that EME is really disabled. ++pref("browser.eme.ui.enabled", false); ++pref("media.gmp-eme-adobe.enabled", false); ++pref("media.eme.enabled", false); ++pref("media.eme.apiVisible", false); ++// WebIDE can bypass proxy settings for remote debugging. It also downloads ++// some additional addons that we have not reviewed. Turn all that off. ++pref("devtools.webide.autoinstallADBHelper", false); ++pref("devtools.webide.autoinstallFxdtAdapters", false); ++pref("devtools.webide.enabled", false); ++pref("devtools.appmanager.enabled", false); ++// The in-browser debugger for debugging chrome code is not coping with our ++// restrictive DNS look-up policy. We use "127.0.0.1" instead of "localhost" as ++// a workaround. See bug 16523 for more details. ++pref("devtools.debugger.chrome-debugging-host", "127.0.0.1"); ++// Don't show the "Open with" option on the download dialog if the preference ++// is |true|. This helps to avoid confusion e.g. in case the browser is ++// sandboxed. See bug 17502 for details. ++pref("browser.download.forbid_open_with", false); ++// Disable mozTCPSocket for sure (bug 18863) ++pref("dom.mozTCPSocket.enabled", false); + -+// Do not report idle status or the away message -+pref("messenger.status.awayWhenIdle", false); -+pref("messenger.status.defaultIdleAwayMessage", ""); -+pref("messenger.status.reportIdle", false); -+// Do not send the message format (fonts, colors) -+pref("messenger.conversations.sendFormat", false); -+// Disable text formatting (remove the tags) -+pref("messenger.options.filterMode", 0); -+// Disable typing notifications -+pref("purple.conversations.im.send_typing", false); ++// Security slider ++pref("svg.in-content.enabled", true); ++pref("mathml.disabled", false); ++// Until we address at least the linkability concerns in #19417 let's disable ++// asmjs. ++pref("javascript.options.asmjs", false); + -+// Browser -+// Disable caching -+pref("browser.cache.disk.enable", false); -+pref("browser.cache.offline.enable", false); ++// Network and performance ++pref("network.http.pipelining", true); ++pref("network.http.pipelining.aggressive", true); ++pref("network.http.pipelining.maxrequests", 12); ++pref("network.http.pipelining.ssl", true); ++pref("network.http.proxy.pipelining", true); ++pref("security.ssl.enable_false_start", true); ++pref("network.http.connection-retry-timeout", 0); ++pref("network.http.max-persistent-connections-per-proxy", 256); ++pref("network.http.pipelining.reschedule-timeout", 15000); ++pref("network.http.pipelining.read-timeout", 60000); ++// Hacked pref: Now means "Attempt to pipeline at least this many requests together" ++pref("network.http.pipelining.max-optimistic-requests", 3); ++pref("security.ssl.disable_session_identifiers", true); ++pref("network.manage-offline-status", false); ++ ++// Disable Xrender as it causes serious performance regressions on some machines ++// and is disabled in Firefox >= 47 anyway. ++pref("gfx.xrender.enabled",false); ++ ++// As a "defense in depth" measure, configure an empty push server URL (the ++// DOM Push features are disabled by default via other prefs). ++pref("dom.push.serverURL", ""); ++ ++// Extension support ++pref("extensions.autoDisableScopes", 0); ++pref("extensions.bootstrappedAddons", "{}"); ++pref("extensions.checkCompatibility.4.*", false); ++pref("extensions.databaseSchema", 3); ++pref("extensions.enabledAddons", "https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,tor-launcher%40torproject.org:0.1.1pre-alpha,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5"); ++pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); ++pref("extensions.enabledScopes", 1); ++pref("extensions.pendingOperations", false); ++pref("xpinstall.whitelist.add", ""); ++pref("xpinstall.whitelist.add.36", ""); + -+// Media -+// Disable WebRTC -+pref("media.peerconnection.enabled", false); -+// Disable "Take Picture" functionality that accesses the webcam -+pref("media.navigator.video.enabled", false); -+// Disable hardware acceleration ++// Toolbar layout ++pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\",\"downloads-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"noscript-tbb\",\"torbutton-button\",\"urlbar-container\",\"search-container\",\"webrtc-status-button\",\"loop-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"]},\"seen\":[],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\",\"PanelUI-contents\",\"addon-bar\"],\"currentVersion\":4,\"newElementCount\":0}"); ++ ++// Putting the search engine prefs into this file to fix #11236. ++// Default search engine ++//pref("browser.search.defaultenginename", "Disconnect"); // TM ++// Make sure we use the same search engine regardless of locale ++pref("browser.search.geoSpecificDefaults", false); ++ ++// Search engine order (order displayed in the search bar dropdown) ++// Somewhat surprisingly we get some random behavior if we specify more than ++// two search engines as below. See ++// https://bugzilla.mozilla.org/show_bug.cgi?id=1126722 for details. ++//pref("browser.search.order.extra.1", "Disconnect"); // TM ++//pref("browser.search.order.extra.2", "YouTube"); // TM ++ ++// Hacks/workarounds: Direct2D seems to crash w/ lots of video cards w/ MinGW? ++// Nvida cards also experience crashes without the second pref set to disabled +pref("gfx.direct2d.disabled", true); +pref("layers.acceleration.disabled", true); -+// Enable SVG, for the TB patch, -+// "Bug 12827: Create preference to disable SVG." -+pref("svg.in-content.enabled", true); + -+// Other Updates -+pref("app.update.promptWaitTime", 3600); ++// Audio_data is deprecated in future releases, but still present ++// in FF24. This is a dangerous combination (spotted by iSec) ++pref("media.audio_data.enabled", false); + -+// Put conversations on hold so that OTR disconnect is not sent. See #20208. -+pref("messenger.conversations.holdByDefault", true); ++// If true, remote JAR files will not be opened, regardless of content type ++// Patch done by Jeff Gibat (iSEC). We bind it to the security slider but allow ++// jar: in default mode. ++pref("network.jar.block-remote-files", false); ++ ++// Enable TLS 1.1 and 1.2: ++// https://trac.torproject.org/projects/tor/ticket/11253 ++pref("security.tls.version.max", 3); ++pref("security.tls.version.min", 1); // TM ++// Disable RC4 fallback. This will go live in Firefox 44, Chrome and IE/Edge: ++// https://blog.mozilla.org/security/2015/09/11/deprecating-the-rc4-cipher/ ++pref("security.tls.unrestricted_rc4_fallback", false); ++ ++// Enforce certificate pinning, see: https://bugs.torproject.org/16206 ++pref("security.cert_pinning.enforcement_level", 2); ++ ++// Enforce SHA1 deprecation, see: bug 18042. ++pref("security.pki.sha1_enforcement_level", 2); ++ ++// Workaround for https://bugs.torproject.org/13579. Progress on ++// `about:downloads` is only shown if the following preference is set to `true` ++// in case the download panel got removed from the toolbar. ++pref("browser.download.panel.shown", true); -- 2.10.2 diff --git a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch index 84b7c3c..33be92a 100644 --- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch +++ b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch @@ -1,4 +1,4 @@ -From 2f9785b7fb8fba1dae99f914a7500bac41d4a17b Mon Sep 17 00:00:00 2001 +From facec2ac69b9068c63278572ffdfa432f259f373 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 16489: Prevent account autologin diff --git a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch index 2b32591..9b9417f 100644 --- a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch +++ b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch @@ -1,4 +1,4 @@ -From fa84f77e4b3c3091aec5a479f862aa8cdb12de6a Mon Sep 17 00:00:00 2001 +From e8cbcbe0aab97d75fec3abe65b575f3e814e7837 Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Sat, 30 Jan 2016 20:56:38 +0100 Subject: [PATCH 03/22] Trac 17896: Support "Special Characters" input prompt diff --git a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch index cc8b392..93eb82f 100644 --- a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch +++ b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch @@ -1,4 +1,4 @@ -From 7fcda7da8eee17eccae8e25a7a24f0b7127fc3af Mon Sep 17 00:00:00 2001 +From 922480805c668eecb6edbbda2b2a4dfb61107144 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 2 Feb 2016 16:04:51 -0800 Subject: [PATCH 04/22] Trac 17494: Better error reporting for failed outgoing diff --git a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch index 8cf35b0..83a4ddd 100644 --- a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch +++ b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch @@ -1,4 +1,4 @@ -From 2a8dc4c8043aeae007b4e727c54137f4ae90f3dd Mon Sep 17 00:00:00 2001 +From 6990be2c6ac257be6f8aa284814489be2c6f25ea Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 15 Mar 2016 17:40:42 -0700 Subject: [PATCH 05/22] Trac 13312: OTR over Twitter DMs diff --git a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch index a87b731..fd8e394 100644 --- a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch +++ b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch @@ -1,4 +1,4 @@ -From 10e196e6c4e26d74baacba3e2b0f367a062b0287 Mon Sep 17 00:00:00 2001 +From ef854ddec3ec3f62d612484d7099e461fe18d128 Mon Sep 17 00:00:00 2001 From: Nihanth Subramanya <nhnt11(a)gmail.com> Date: Sun, 9 Oct 2016 21:53:04 -0700 Subject: [PATCH 06/22] Bug 1218193 - Fix tab strip background colour on OS X. diff --git a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch index ac16309..01da37e 100644 --- a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch +++ b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch @@ -1,4 +1,4 @@ -From ecee8301b2187ea25e582d15e3d02bec5d29078e Mon Sep 17 00:00:00 2001 +From a60538df8166c6eb8e267ac92598706c25ff35f8 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 9 Oct 2016 21:57:07 -0700 Subject: [PATCH 07/22] Bug 1246431 - XMPP createConversation should handle diff --git a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch index f336a84..bc5194a 100644 --- a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch +++ b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch @@ -1,4 +1,4 @@ -From 899378439d41d0ee36cba761edf43e4329cd9c07 Mon Sep 17 00:00:00 2001 +From 2ed57a22907efdee880b30d956391d52417b01a6 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 28 Aug 2016 08:57:41 -0700 Subject: [PATCH 08/22] Bug 1298574 - Set _userVCard own property when diff --git a/projects/instantbird/0009-XMPP-in-band-registration.patch b/projects/instantbird/0009-XMPP-in-band-registration.patch index 41e9f90..db258da 100644 --- a/projects/instantbird/0009-XMPP-in-band-registration.patch +++ b/projects/instantbird/0009-XMPP-in-band-registration.patch @@ -1,4 +1,4 @@ -From 1e0665d52f89f61af5dd07fc1d0c31dd90c0a483 Mon Sep 17 00:00:00 2001 +From d28b2c39b8f9249490dc6499d831e6e6adbe838a Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:42:25 -0700 Subject: [PATCH 09/22] XMPP in-band registration diff --git a/projects/instantbird/0010-Remove-search-from-UI.patch b/projects/instantbird/0010-Remove-search-from-UI.patch index 55f22ab..fe91747 100644 --- a/projects/instantbird/0010-Remove-search-from-UI.patch +++ b/projects/instantbird/0010-Remove-search-from-UI.patch @@ -1,4 +1,4 @@ -From a9aa4108eceba8f5d4472b27ba7f0f3223d535bc Mon Sep 17 00:00:00 2001 +From 33ec527a5ba77bbe3af57666c9a25b54d2d97512 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 10/22] Remove search from UI diff --git a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch index 9b2d571..6b0847f 100644 --- a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch @@ -1,4 +1,4 @@ -From ce1cba5c29e974399693c6b3dbd02b372a8a6ab3 Mon Sep 17 00:00:00 2001 +From 41c60f97c6049e4e3bc130fa963616e9ddc77af6 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:56:27 -0700 Subject: [PATCH 11/22] Add Tor Messenger branding diff --git a/projects/instantbird/0012-Account-picture.patch b/projects/instantbird/0012-Account-picture.patch index 6c48541..be7c944 100644 --- a/projects/instantbird/0012-Account-picture.patch +++ b/projects/instantbird/0012-Account-picture.patch @@ -1,4 +1,4 @@ -From a40ca36edcb6b2be8ed958e39479998a8fe4fbc3 Mon Sep 17 00:00:00 2001 +From 65de52be6fbf68084231270ec14c84f225ed0fed 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 12/22] Account picture diff --git a/projects/instantbird/0013-Modify-protocol-defaults.patch b/projects/instantbird/0013-Modify-protocol-defaults.patch index cc51976..363c197 100644 --- a/projects/instantbird/0013-Modify-protocol-defaults.patch +++ b/projects/instantbird/0013-Modify-protocol-defaults.patch @@ -1,4 +1,4 @@ -From 82b8069f3b5eef5d6ed8a87e8b122e2b0eae3a76 Mon Sep 17 00:00:00 2001 +From 8dd9a15845160e182b8ca44e6f4d07fdd59ffed0 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:25:34 -0700 Subject: [PATCH 13/22] Modify protocol defaults diff --git a/projects/instantbird/0014-Modify-IRC-defaults.patch b/projects/instantbird/0014-Modify-IRC-defaults.patch index 6d43240..3543d97 100644 --- a/projects/instantbird/0014-Modify-IRC-defaults.patch +++ b/projects/instantbird/0014-Modify-IRC-defaults.patch @@ -1,4 +1,4 @@ -From 14b1768d06adce5dd85dd56ea4c89984d420c36e Mon Sep 17 00:00:00 2001 +From ac449194473c8d254672c653b73f66350e665cc8 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 14/22] Modify IRC defaults diff --git a/projects/instantbird/0015-Modify-themes.patch b/projects/instantbird/0015-Modify-themes.patch index ef7197c..e70f9aa 100644 --- a/projects/instantbird/0015-Modify-themes.patch +++ b/projects/instantbird/0015-Modify-themes.patch @@ -1,4 +1,4 @@ -From 8f6fad682f3fc785e324faf086e5248b54e50f2e Mon Sep 17 00:00:00 2001 +From 38fbe7232753738d91ce12c4df53fe83a3192e16 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 15/22] Modify themes diff --git a/projects/instantbird/0016-Modify-XMPP-defaults.patch b/projects/instantbird/0016-Modify-XMPP-defaults.patch index 202cfb1..b91f9f4 100644 --- a/projects/instantbird/0016-Modify-XMPP-defaults.patch +++ b/projects/instantbird/0016-Modify-XMPP-defaults.patch @@ -1,4 +1,4 @@ -From 7002186f102f329431ad1f1afce87af75f7a4570 Mon Sep 17 00:00:00 2001 +From 64746206241b088e2a609662fcbe0edc3baad88b Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:38:49 -0700 Subject: [PATCH 16/22] Modify XMPP defaults diff --git a/projects/instantbird/0017-Remove-logging-UI.patch b/projects/instantbird/0017-Remove-logging-UI.patch index 4ac4152..802dfe8 100644 --- a/projects/instantbird/0017-Remove-logging-UI.patch +++ b/projects/instantbird/0017-Remove-logging-UI.patch @@ -1,4 +1,4 @@ -From af2bff6a7f15123c567b4c911b5842423fee0514 Mon Sep 17 00:00:00 2001 +From 47bb9db3798b59d066399ec289295229a1aa4168 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 17/22] Remove logging UI diff --git a/projects/instantbird/0018-Cert-override.patch b/projects/instantbird/0018-Cert-override.patch index bea2ec5..ffd1fd2 100644 --- a/projects/instantbird/0018-Cert-override.patch +++ b/projects/instantbird/0018-Cert-override.patch @@ -1,4 +1,4 @@ -From da09cc5555865e5f86a4627d9ad1fd9de4dd392b Mon Sep 17 00:00:00 2001 +From 9ded93b407e23a54bd335d273d31496bc426ffd1 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 18/22] Cert override diff --git a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch index d1ffe21..41a87c1 100644 --- a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch @@ -1,4 +1,4 @@ -From b4e33411b5743601307009ce6e31235fccb57ba3 Mon Sep 17 00:00:00 2001 +From 119c059b638fcb772c4e9aa952d9899d58d93264 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 19/22] Display all traffic over Tor diff --git a/projects/instantbird/0020-Trac-17480-Content-sink.patch b/projects/instantbird/0020-Trac-17480-Content-sink.patch index 29aeaf4..723330d 100644 --- a/projects/instantbird/0020-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0020-Trac-17480-Content-sink.patch @@ -1,4 +1,4 @@ -From 2194d4caace6d18b2a33a57df3618019b9bc77d8 Mon Sep 17 00:00:00 2001 +From 7512783d8cbcd15c9b0c2bfd07fbf4c2ff628f6e 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 20/22] Trac 17480: Content sink diff --git a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch index 7d0df64..5a16f93 100644 --- a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,4 +1,4 @@ -From afec16433c83df4452b6b362032cd624f7f5541d Mon Sep 17 00:00:00 2001 +From d6b9d9b02c72f979a8a01eef2bd6c358dfc5394b 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 21/22] SASL ECDSA-NIST256P-CHALLENGE diff --git a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch index f80c5e2..56a638e 100644 --- a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch +++ b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch @@ -1,4 +1,4 @@ -From 6f07adf6e3db9f65cf4c45ecaba8f1f12423acff Mon Sep 17 00:00:00 2001 +From 6c0d0db66b8375dd63a1f7bfe1661c8956f6d6cb Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Wed, 26 Oct 2016 20:16:58 +0200 Subject: [PATCH 22/22] Bug 1313137 - "msg is not defined" error in

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 05 Nov '16

05 Nov '16

commit e566ed341549cb9d3f9e606dc170feb7236204aa Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 5 11:47:05 2016 +0000 Update translations for torbutton-abouttorproperties_completed --- it/abouttor.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/it/abouttor.properties b/it/abouttor.properties index db49b15..58592a6 100644 --- a/it/abouttor.properties +++ b/it/abouttor.properties @@ -19,3 +19,10 @@ aboutTor.searchDC.privacy=Cerca <a href="%1$S"> in sicurezza </a> con <a href="% aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ + +aboutTor.donationBanner.donate=Dona ora! +aboutTor.donationBanner.heart=Tor è al centro della libertà di Internet +aboutTor.donationBanner.tagline1=Milioni di persone dipendono da Tor per la loro Sicurezza e Privacy online +aboutTor.donationBanner.tagline2=Una rete di persone a protezione delle persone +aboutTor.donationBanner.tagline3=Sorveglianza = Oppressione +aboutTor.donationBanner.tagline4=Proteggiamo giornalisti, attivisti e informatori dal 2006

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 05 Nov '16

05 Nov '16

commit a4449a431df3e6aaccfd40429f10dbb9f4ab77d0 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 5 11:47:00 2016 +0000 Update translations for torbutton-abouttorproperties --- it/abouttor.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/it/abouttor.properties b/it/abouttor.properties index e44a34b..58592a6 100644 --- a/it/abouttor.properties +++ b/it/abouttor.properties @@ -21,8 +21,8 @@ aboutTor.searchDC.privacy.link=https://disconnect.me/privacy aboutTor.searchDC.search.link=https://search.disconnect.me/ aboutTor.donationBanner.donate=Dona ora! -aboutTor.donationBanner.heart=Tor is at the heart of Internet freedom -aboutTor.donationBanner.tagline1=Millions of People Depend on Tor for Online Security & Privacy -aboutTor.donationBanner.tagline2=A Network of People Protecting People +aboutTor.donationBanner.heart=Tor è al centro della libertà di Internet +aboutTor.donationBanner.tagline1=Milioni di persone dipendono da Tor per la loro Sicurezza e Privacy online +aboutTor.donationBanner.tagline2=Una rete di persone a protezione delle persone aboutTor.donationBanner.tagline3=Sorveglianza = Oppressione -aboutTor.donationBanner.tagline4=Protecting Journalists, Activists & Whistleblowers Since 2006 +aboutTor.donationBanner.tagline4=Proteggiamo giornalisti, attivisti e informatori dal 2006

1 0

[tor-messenger-build/master] Install libc6-i386 when creating mar files for linux-i686
by boklm＠torproject.org 05 Nov '16

05 Nov '16

commit 0b7aae46a2c731abd7bac8405e4b4939ab11cea5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Nov 5 11:23:26 2016 +0100 Install libc6-i386 when creating mar files for linux-i686 This is required to use mar-tools-linux32.zip. --- projects/tor-messenger/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 73d8cfa..ba60a99 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -74,6 +74,8 @@ targets: var: bundle_filename: 'tor-messenger-linux32-[% c("version") %]_en-US.tar.xz' mar_osname: linux32 + arch_deps: + - libc6-i386 linux-x86_64: var: bundle_filename: 'tor-messenger-linux64-[% c("version") %]_en-US.tar.xz'

1 0

[tor-messenger-build/master] Factor out common mozconfigs
by arlo＠torproject.org 05 Nov '16

05 Nov '16

commit 7aa51976111e377db911b69ecf17053c67429eff Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Nov 4 17:38:19 2016 -0700 Factor out common mozconfigs --- projects/instantbird/build | 3 ++- projects/instantbird/config | 1 + projects/instantbird/mozconfig-common | 21 +++++++++++++++++++++ projects/instantbird/mozconfig-linux-i686 | 25 ++----------------------- projects/instantbird/mozconfig-linux-x86_64 | 24 ++---------------------- projects/instantbird/mozconfig-osx-x86_64 | 27 ++------------------------- projects/instantbird/mozconfig-windows-i686 | 26 +++----------------------- 7 files changed, 33 insertions(+), 94 deletions(-) diff --git a/projects/instantbird/build b/projects/instantbird/build index 999c2a0..ca349ec 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -58,7 +58,8 @@ done echo '[% c("var/tormessenger_version") %]' > im/config/version.txt -cp $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig +cp $rootdir/mozconfig-common .mozconfig +cat $rootdir/[% c('input_files_by_name/mozconfig') %] >> .mozconfig echo ac_add_options --with-tor-browser-version='[% c("var/tormessenger_version") %]' >> .mozconfig ./mozilla/mach build diff --git a/projects/instantbird/config b/projects/instantbird/config index d105f91..238042f 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -84,6 +84,7 @@ input_files: - filename: 0020-Trac-17480-Content-sink.patch - filename: 0021-SASL-ECDSA-NIST256P-CHALLENGE.patch - filename: 0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch + - filename: mozconfig-common - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig - name: mozilla diff --git a/projects/instantbird/mozconfig-common b/projects/instantbird/mozconfig-common new file mode 100644 index 0000000..5d5552e --- /dev/null +++ b/projects/instantbird/mozconfig-common @@ -0,0 +1,21 @@ +no_tooltool=1 + +ac_add_options --enable-application=im +ac_add_options --enable-optimize +ac_add_options --with-l10n-base=.. +ac_add_options --with-branding=im/branding/messenger + +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc +ac_add_options --disable-tests +ac_add_options --disable-debug + +ac_add_options --enable-tor-browser-update +ac_add_options --enable-update-channel=release +ac_add_options --enable-update-packaging +ac_add_options --enable-signmar +ac_add_options --enable-verify-mar + +ac_add_options --disable-eme +ac_add_options --disable-loop diff --git a/projects/instantbird/mozconfig-linux-i686 b/projects/instantbird/mozconfig-linux-i686 index 34d7b81..748f937 100644 --- a/projects/instantbird/mozconfig-linux-i686 +++ b/projects/instantbird/mozconfig-linux-i686 @@ -1,5 +1,3 @@ -no_tooltool=1 - export CFLAGS="-m32 -gdwarf-2 -Wno-sign-compare" export CXXFLAGS="-m32 -gdwarf-2" export LDFLAGS=-m32 @@ -10,26 +8,7 @@ export ASFLAGS=-m32 export MOZ_DEBUG_SYMBOLS=1 ac_add_options --enable-debug-symbols="-gdwarf-2" -ac_add_options --with-ccache -ac_add_options --enable-application=im -ac_add_options --enable-optimize - -ac_add_options --with-l10n-base=.. - ac_add_options --host=i686-linux-gnu - -ac_add_options --with-branding=im/branding/messenger - -ac_add_options --disable-maintenance-service -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-tests -ac_add_options --disable-debug - ac_add_options --enable-default-toolkit=cairo-gtk2 - -ac_add_options --enable-tor-browser-update -ac_add_options --enable-update-channel=release -ac_add_options --enable-update-packaging -ac_add_options --enable-signmar -ac_add_options --enable-verify-mar +ac_add_options --disable-strip +ac_add_options --disable-install-strip diff --git a/projects/instantbird/mozconfig-linux-x86_64 b/projects/instantbird/mozconfig-linux-x86_64 index 0264f8f..3540800 100644 --- a/projects/instantbird/mozconfig-linux-x86_64 +++ b/projects/instantbird/mozconfig-linux-x86_64 @@ -1,5 +1,3 @@ -no_tooltool=1 - export CFLAGS="-gdwarf-2 -Wno-sign-compare" export CXXFLAGS="-gdwarf-2" @@ -7,24 +5,6 @@ export CXXFLAGS="-gdwarf-2" export MOZ_DEBUG_SYMBOLS=1 ac_add_options --enable-debug-symbols="-gdwarf-2" -ac_add_options --with-ccache -ac_add_options --enable-application=im -ac_add_options --enable-optimize - -ac_add_options --with-l10n-base=.. - -ac_add_options --with-branding=im/branding/messenger - -ac_add_options --disable-maintenance-service -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-tests -ac_add_options --disable-debug - ac_add_options --enable-default-toolkit=cairo-gtk2 - -ac_add_options --enable-tor-browser-update -ac_add_options --enable-update-channel=release -ac_add_options --enable-update-packaging -ac_add_options --enable-signmar -ac_add_options --enable-verify-mar +ac_add_options --disable-strip +ac_add_options --disable-install-strip diff --git a/projects/instantbird/mozconfig-osx-x86_64 b/projects/instantbird/mozconfig-osx-x86_64 index 9eaed84..d9c8364 100644 --- a/projects/instantbird/mozconfig-osx-x86_64 +++ b/projects/instantbird/mozconfig-osx-x86_64 @@ -1,6 +1,4 @@ -CROSS_COMPILE=1 - -no_tooltool=1 +export CROSS_COMPILE=1 TOOLCHAIN_PREFIX="$ccbindir/x86_64-apple-darwin10-" CROSS_PRIVATE_FRAMEWORKS="$sysrootdir/System/Library/PrivateFrameworks" @@ -9,28 +7,7 @@ FLAGS="-arch x86_64 -isysroot $sysrootdir" CC="$ccbindir/x86_64-apple-darwin10-clang $FLAGS" CXX="$ccbindir/x86_64-apple-darwin10-clang++ $FLAGS" -ac_add_options --enable-application=im -ac_add_options --enable-optimize ac_add_options --target=x86_64-apple-darwin10 -ac_add_options --enable-strip ac_add_options --with-macos-private-frameworks="$CROSS_PRIVATE_FRAMEWORKS" -# Let's not compile EME at least until we can enable ClearKey and only Clearkey. -# (Apart from that there is no Adobe CRM module for OS X right now) -ac_add_options --disable-eme - -ac_add_options --with-l10n-base=.. - -ac_add_options --with-branding=im/branding/messenger - -ac_add_options --disable-maintenance-service -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-tests -ac_add_options --disable-debug - -ac_add_options --enable-tor-browser-update -ac_add_options --enable-update-channel=release -ac_add_options --enable-update-packaging -ac_add_options --enable-signmar -ac_add_options --enable-verify-mar ac_add_options --enable-tor-browser-data-outside-app-dir +ac_add_options --enable-strip diff --git a/projects/instantbird/mozconfig-windows-i686 b/projects/instantbird/mozconfig-windows-i686 index 71698ec..e9c3f3f 100644 --- a/projects/instantbird/mozconfig-windows-i686 +++ b/projects/instantbird/mozconfig-windows-i686 @@ -1,33 +1,13 @@ export CROSS_COMPILE=1 -no_tooltool=1 - ac_add_options --target=i686-w64-mingw32 ac_add_options --enable-default-toolkit=cairo-windows ac_add_options --enable-strip -ac_add_options --enable-application=im -ac_add_options --enable-optimize - -ac_add_options --with-l10n-base=.. - -# sandbox currently fail to build with mingw, see trac 16010 -ac_add_options --disable-sandbox - # ICU seems still to have cross-compiling issues: # https://bugzilla.mozilla.org/show_bug.cgi?id=1019744#c19 ac_add_options --without-intl-api -ac_add_options --with-branding=im/branding/messenger - -ac_add_options --disable-crashreporter -ac_add_options --disable-maintenance-service -ac_add_options --disable-webrtc -ac_add_options --disable-tests -ac_add_options --disable-debug - -ac_add_options --enable-tor-browser-update -ac_add_options --enable-update-channel=release -ac_add_options --enable-update-packaging -ac_add_options --enable-signmar -ac_add_options --enable-verify-mar +# We can't build the sandbox code with mingw-w64: +# https://bugzilla.mozilla.org/show_bug.cgi?id=1042426 +ac_add_options --disable-sandbox

1 0

[tor-messenger-build/master] Make projects/tor-messenger output to a directory
by boklm＠torproject.org 05 Nov '16

05 Nov '16

commit 0bee903d5ce1141ec6175ecc7aa8bc477c7ed619 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Nov 4 18:28:00 2016 +0100 Make projects/tor-messenger output to a directory This will now output to a directory, only containing one file. This is the first step before adding the mar file and mar-tools.zip to that directory. --- projects/tor-messenger-release/config | 8 ++++---- projects/tor-messenger/build | 6 ++++-- projects/tor-messenger/build.osx | 3 ++- projects/tor-messenger/config | 13 +++++++++---- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/projects/tor-messenger-release/config b/projects/tor-messenger-release/config index 87185ca..aa19275 100644 --- a/projects/tor-messenger-release/config +++ b/projects/tor-messenger-release/config @@ -34,10 +34,10 @@ build: | export LC_ALL=C destdir="[% dest_dir _ '/' _ c("version") %]" mkdir -p "$destdir" - mv [% c('input_files_by_name/linux-x86_64') %] "$destdir"/tor-messenger-linux64-[% c("version") %]_en-US.tar.xz - mv [% c('input_files_by_name/linux-i686') %] "$destdir"/tor-messenger-linux32-[% c("version") %]_en-US.tar.xz - mv [% c('input_files_by_name/windows-i686') %] "$destdir"/tormessenger-install-[% c("version") %]_en-US.exe - mv [% c('input_files_by_name/osx-x86_64') %] "$destdir"/TorMessenger-[% c("version") %]-osx64_en-US.dmg + 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 | sort) > sha256sums.txt cat sha256sums.txt diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 821cd4e..ee6b2f3 100755 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -89,6 +89,7 @@ rm -Rf Browser/TorBrowser/Data/Browser/profile.default/extensions/tor-browser_en cd .. mv bundle tor-messenger +mkdir -p '[% dest_dir _ "/" _ c("filename") %]' [% IF c('var/windows') -%] makensis tor-messenger.nsi @@ -106,10 +107,11 @@ mv tor-messenger-install.exe tor-messenger-install-tmp.exe 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 [% dest_dir _ '/' _ c('filename') %] +mv tor-messenger-install.exe [% dest_dir _ '/' _ c('filename') _ '/' _ c('var/bundle_filename') %] [% ELSE -%] [% c('tar', { tar_src => [ 'tor-messenger' ], - tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename'), + tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') + _ '/' _ c('var/bundle_filename'), }) %] [% END -%] diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index 2c8bc83..02fa589 100755 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -62,4 +62,5 @@ find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ../filelis mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o ../TorMessenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755 cd .. -dmg dmg TorMessenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') %] +mkdir -p '[% dest_dir _ "/" _ c("filename") %]' +dmg dmg TorMessenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') _ '/' _ c('var/bundle_filename') %] diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 70ae860..0b861ce 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: '[% c("var/tormessenger_version") %]' -filename: 'tor-messenger-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].[% c("var/filename_ext") %]' +filename: 'tor-messenger-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' input_files: - name: instantbird project: instantbird @@ -47,7 +47,6 @@ input_files: remote_docker: 1 distribution: Debian-7.11 var: - filename_ext: 'tar.xz' deps: - p7zip-full - bzip2 @@ -55,7 +54,7 @@ targets: windows-i686: distribution: Ubuntu-14.10 var: - filename_ext: 'exe' + bundle_filename: 'tormessenger-install-[% c("version") %]_en-US.exe' arch_deps: - nsis - python @@ -64,7 +63,13 @@ targets: osx-x86_64: distribution: Ubuntu-12.04 var: - filename_ext: 'dmg' + bundle_filename: 'TorMessenger-[% c("version") %]-osx64_en-US.dmg' arch_deps: - genisoimage - bsdtar + linux-i686: + var: + bundle_filename: 'tor-messenger-linux32-[% c("version") %]_en-US.tar.xz' + linux-x86_64: + var: + bundle_filename: 'tor-messenger-linux64-[% c("version") %]_en-US.tar.xz'

1 0

[tor-messenger-build/master] Create full mar files
by boklm＠torproject.org 05 Nov '16

05 Nov '16

commit a0b2e732c6e9fb7e5ee75bf762df1dd009797b1f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Nov 5 02:09:26 2016 +0100 Create full mar files --- projects/tor-messenger/build | 26 +++++++++++++++++++++----- projects/tor-messenger/build.osx | 16 +++++++++++++--- projects/tor-messenger/config | 5 +++++ 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 688c932..1415f22 100755 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -1,6 +1,10 @@ #!/bin/sh set -e +mkdir -p /var/tmp/dist +7z x -o/var/tmp/dist [% c('input_files_by_name/instantbird') %]/mar-tools-*.zip +MARTOOLS=/var/tmp/dist/mar-tools + [% IF c("var/osx"); INCLUDE build.osx; STOP; @@ -86,10 +90,23 @@ mv Browser/TorBrowser/Data/Browser/profile.default/extensions/tor-browser_en-US/ cp Browser/TorBrowser/Data/Browser/profile.default/extensions/tor-browser_en-US/Browser/TorBrowser/Data/Tor/* Browser/TorBrowser/Data/Tor/ rm -Rf Browser/TorBrowser/Data/Browser/profile.default/extensions/tor-browser_en-US + +# Recreate precomplete file (needs to be accurate for full MAR updates). +cd Browser +rm -f precomplete +python $MARTOOLS/createprecomplete.py +cd .. + cd .. mv bundle tor-messenger -mkdir -p '[% dest_dir _ "/" _ c("filename") %]' +OUTDIR='[% dest_dir _ "/" _ c("filename") %]' +mkdir -p $OUTDIR +MAR_FILE=tor-messenger-[% c("var/mar_osname") %]-[% c("version") %]_en-US.mar +MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff[% IF c("var/windows") %].exe[% END %] \ + $MARTOOLS/make_full_update.sh \ + -q $OUTDIR/$MAR_FILE tor-messenger/Browser + [% IF c('var/windows') -%] makensis tor-messenger.nsi @@ -107,12 +124,11 @@ mv tor-messenger-install.exe tor-messenger-install-tmp.exe 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 [% dest_dir _ '/' _ c('filename') _ '/' _ c('var/bundle_filename') %] +mv tor-messenger-install.exe $OUTDIR/[% c('var/bundle_filename') %] [% ELSE -%] [% c('tar', { tar_src => [ 'tor-messenger' ], - tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') - _ '/' _ c('var/bundle_filename'), + tar_args => '-cJf $OUTDIR/' _ c('var/bundle_filename'), }) %] [% END -%] -mv -f [% c('input_files_by_name/instantbird') %]/mar-tools-*.zip [% dest_dir _ '/' _ c('filename') %] +mv -f [% c('input_files_by_name/instantbird') %]/mar-tools-*.zip $OUTDIR/ diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index 99cde39..2c65e3f 100755 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -55,6 +55,12 @@ cp $rootdir/background.png .background/ cp $rootdir/DS_Store .DS_Store ln -s /Applications/ . +# Recreate precomplete file (needs to be accurate for full MAR updates). +cd TorMessenger.app/Contents/Resources +rm -f precomplete +python $MARTOOLS/createprecomplete.py +cd ../../.. + find . -executable -exec chmod 755 {} \; find . ! -executable -exec chmod 644 {} \; find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ../filelist.txt @@ -62,6 +68,10 @@ find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ../filelis mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o ../TorMessenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755 cd .. -mkdir -p '[% dest_dir _ "/" _ c("filename") %]' -dmg dmg TorMessenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') _ '/' _ c('var/bundle_filename') %] -mv -f [% c('input_files_by_name/instantbird') %]/mar-tools-*.zip [% dest_dir _ '/' _ c('filename') %] +OUTDIR='[% dest_dir _ "/" _ c("filename") %]' +mkdir -p $OUTDIR +dmg dmg TorMessenger-uncompressed.dmg $OUTDIR/[% c('var/bundle_filename') %] +mv -f [% c('input_files_by_name/instantbird') %]/mar-tools-*.zip $OUTDIR +MAR_FILE=tor-messenger-[% c("var/mar_osname") %]-[% c("version") %]_en-US.mar +MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh \ + -q $OUTDIR/$MAR_FILE dmg/TorMessenger.app diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 0b861ce..73d8cfa 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -50,11 +50,13 @@ var: deps: - p7zip-full - bzip2 + - python targets: windows-i686: distribution: Ubuntu-14.10 var: bundle_filename: 'tormessenger-install-[% c("version") %]_en-US.exe' + mar_osname: win32 arch_deps: - nsis - python @@ -64,12 +66,15 @@ targets: distribution: Ubuntu-12.04 var: bundle_filename: 'TorMessenger-[% c("version") %]-osx64_en-US.dmg' + mar_osname: osx64 arch_deps: - genisoimage - bsdtar linux-i686: var: bundle_filename: 'tor-messenger-linux32-[% c("version") %]_en-US.tar.xz' + mar_osname: linux32 linux-x86_64: var: bundle_filename: 'tor-messenger-linux64-[% c("version") %]_en-US.tar.xz' + mar_osname: linux64

1 0